sascha
/
difftastic
mirror of https://github.com/Wilfred/difftastic/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
14,970 Commits
43 Branches
77 Tags
1.9 GiB
Commit Graph

14970 Commits (ffe27c575ee222647cec98ba52f1c03a19055372)
 

Author SHA1 Message Date
Wilfred Hughes ffe27c575e Ensure line splitting distinguishes "foo" and "foo\n" 
We rely on being able to split lines and rejoin them to obtain the
original string. `str::lines()` in the Rust stdlib does not have this
property.

This was causing crashes in word-diffing on textual diffing, where
code paths differed on the number of lines they thought a string had.

This was broken in 8b842387a1.

Fixes #688.
 2024-07-20 16:09:44 +07:00
Yedaya Katsman efe1b10e8d Update the cc package to 1.1.5 
This includes the fix to https://github.com/rust-lang/cc-rs/issues/909
which spams warnings on ubuntu 22.04
 2024-07-18 07:25:35 +07:00
Wilfred Hughes 7248e334b7 Update to latest rustc-hash version 
This is a very minor performance win, a few percent in my
benchmarking.

typing_1.ml went from 3.013M to 2.996M instructions (0.6% reduction).
slow_1.rs went from 2.153M to 2.046M instructions (5% reduction).

Fixes #728
 2024-07-09 00:18:59 +07:00
Wilfred Hughes f1bd870382 Document how difftastic handles unordered syntax 
Closes #723
 2024-07-08 23:41:58 +07:00
Wilfred Hughes 79af24a577 Fix typo 2024-07-08 08:39:20 +07:00
Wilfred Hughes 27a0cfba16 Silence some clippy warnings 2024-06-29 23:08:11 +07:00
Marcel 759797c851 guess_language: add flake.lock as json 2024-06-27 08:09:28 +07:00
wangweijie 1fba1c7e4a deps: bump libc from 0.2.153 to 0.2.155 
Signed-off-by: wangweijie <wangweijie@loongson.cn>
 2024-05-29 07:22:15 +07:00
Wilfred Hughes b88b405620 Notes on next tree-sitter version 2024-05-25 07:13:37 +07:00
Wilfred Hughes c503a7564e Update regex dependency 2024-05-25 15:02:57 +07:00
Wilfred Hughes 7827a059cb Update F# expected output 2024-05-25 14:58:14 +07:00
Wilfred Hughes d7188f7178 Remove unused struct 2024-05-25 14:55:39 +07:00
Wilfred Hughes a9bcee7733 Add sample conflicts file 
This is already referenced in the manual.
 2024-05-14 10:14:05 +07:00
Wilfred Hughes a259c858a1 Update F# docs 2024-05-14 10:13:37 +07:00
Wilfred Hughes ac5af62606 Merge commit 'b5dbafd164af7113e208de9b36068046f5ce8678' into f_sharp 2024-05-14 10:08:50 +07:00
Wilfred Hughes d92b65c5fd Merge remote-tracking branch 'thecentury/f#' 2024-05-14 09:46:55 +07:00
Wilfred Hughes d292546df7 Prefer 'device tree' as two words 2024-05-13 16:59:48 +07:00
Wilfred Hughes de9c84c418 Document new addition 2024-05-13 16:52:33 +07:00
Wilfred Hughes d3e5aa5232 Merge remote-tracking branch 'blmaier/support-devicetree' 2024-05-13 16:50:13 +07:00
Wilfred Hughes 11e2c49b7e Fix wording 2024-05-13 16:32:45 +07:00
Wilfred Hughes 5a250d63df Expand usage docs and fix obsolete reference to --language 
Fixes #712
 2024-05-13 16:31:30 +07:00
Nikolaj Sidorenco b5dbafd164
fix: multi line triple quoted strings 2024-05-13 23:35:55 +07:00
Wilfred Hughes 809f49124c Remove empty comment 2024-05-11 22:10:17 +07:00
Wilfred Hughes 28d8673371 Treat tree-sitter nodes highlighted as comments as atoms 
Fixes #711
 2024-05-11 22:03:59 +07:00
Wilfred Hughes e51834fa77 Support comment.foo highlighting queries 
This should improve highlighting in cases like Elm that use
`@comment.elm`.
 2024-05-11 16:08:29 +07:00
Wilfred Hughes 835c5eb757 Roll version following release 2024-05-11 13:54:42 +07:00
Wilfred Hughes 0c9277108b It's not actually a 2x perf win 
It's more like a 15% reduction in instruction count, which is still
nice.
 2024-05-10 16:28:16 +07:00
Wilfred Hughes edb839c803 Improve terminal width detection 
Ensure the value is always non-zero, and consider $COLUMNS if
crossterm does not succeed.

Fixes #707
 2024-05-10 16:26:48 +07:00
Wilfred Hughes 9d2574dbd1 Update assert_cmd dependency 2024-05-10 16:08:56 +07:00
Wilfred Hughes be95b31896 Tests do actually import predicates, so restore dependency with looser bounds 2024-05-10 16:02:21 +07:00
Wilfred Hughes f665c73fe0 Remove pin in dev dependencies that is no longer necessary 2024-05-10 15:57:14 +07:00
Wilfred Hughes 6a3b340d5f Prefer 'terminal' over 'display' terminology 2024-05-10 15:53:40 +07:00
Wilfred Hughes ec7a765453 Factor out a constant for the default terminal width 2024-05-10 15:50:56 +07:00
Nikolaj Sidorenco 7769a19509
feat: shorthand array type postfix 2024-05-07 22:57:54 +07:00
Wilfred Hughes 1954f15e0d Fix typo 2024-05-07 08:50:54 +07:00
Grégoire Paris 082abf65d1 Document how to disable difftastic temporarily 
It can be useful if you want to obtain a diff in the standard format and
copy paste it to github, for instance.
 2024-05-07 08:48:20 +07:00
Wilfred Hughes 0ceb00093a Move notes to wiki 2024-05-07 08:42:45 +07:00
Wilfred Hughes 03d1f9bf26 Lint against .to_string() on String 2024-05-07 08:39:07 +07:00
Wilfred Hughes 9474635076 Prefer .to_owned() on &str 2024-05-07 08:32:30 +07:00
Wilfred Hughes 33542a47d5 Update CMake highlights for latest grammar 2024-05-07 08:29:34 +07:00
Nikolaj Sidorenco 5c85c505b5
fix: repeated attributes 2024-05-06 20:36:57 +07:00
Nikolaj Sidorenco c4d2c743e7
fix: ce expression vs application expression nested 2024-05-06 20:08:20 +07:00
dependabot[bot] 15c58119a9
build(deps-dev): bump eslint from 9.1.1 to 9.2.0 (#53) 2024-05-06 17:34:24 +07:00
dependabot[bot] 15c81bd1ba
build(deps): bump node-gyp-build from 4.8.0 to 4.8.1 (#52) 2024-05-06 17:32:52 +07:00
dependabot[bot] 6a7042c0e6
build(deps-dev): bump tree-sitter-cli from 0.22.5 to 0.22.6 (#51) 2024-05-06 17:32:22 +07:00
Nikolaj Sidorenco ccd13da847
fix: ce expression vs application expression 2024-05-05 16:11:37 +07:00
Nikolaj Sidorenco 830d01faa1
fix type decl scoping 2024-05-05 16:06:50 +07:00
Nikolaj Sidorenco c5fff9dc9d
clean up parser states for types 2024-05-04 15:04:50 +07:00
Nikolaj Sidorenco 6c7f980d42
feat: allow top-level expressions 2024-05-03 16:18:37 +07:00
Nikolaj Sidorenco 36eeeb4689
fix: prefix expression associativity 2024-05-02 23:05:15 +07:00