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

8568 Commits (e653b771941189481005150fac5094d702dffa92)
 

Author SHA1 Message Date
Wilfred Hughes e653b77194 Hack is not currently supported 2022-03-30 22:46:40 +07:00
Wilfred Hughes 5703f75568 Don't assume that lines end with newlines 
Previously we would crash if the last line in a file had no trailing
newline and ended with a multibyte character.

Closes #217
 2022-03-30 22:42:17 +07:00
Wilfred Hughes ff37192918 Update changelog for last commit 2022-03-30 20:56:12 +07:00
Dmitry Marakasov 9fc437216c Make --color affect missing line number formatting 
Fixes #213
 2022-03-30 20:55:23 +07:00
Wilfred Hughes ce076a142b Tweak formatting in README 
Half the sentence being bold looks untidy.
 2022-03-30 20:54:37 +07:00
Wilfred Hughes d1c25576ba
Merge pull request #206 from mjul/patch-1 
Fix "she-bang" typo
 2022-03-30 09:11:22 +07:00
Martin Jul 4747517039
Fix "she-bang" typo 
This makes the test correct in case the full rule of only recognizing an Emacs mode line on the second line if the first line is a "she-bang" line is ever fully implemented.
 2022-03-30 09:57:37 +07:00
Wilfred Hughes 5116c69afe Make installation instructions more prominent 2022-03-29 23:22:33 +07:00
Wilfred Hughes 16ecf15867 Mention prebuilt packages and expand build instructions 
Fixes #202
 2022-03-29 23:20:22 +07:00
Wilfred Hughes 3c84538253 Escape newlines in --dump-ts when the node kind is '\n' 
--dump-ts is only intended as a debugging feature, but it's a little
confusing when newlines aren't escaped.

Fixes #203
 2022-03-29 22:51:38 +07:00
Wilfred Hughes ecdf993ff1 Add support for Nix 
Closes #196
 2022-03-29 22:46:09 +07:00
Wilfred Hughes 641ba87416 Add 'vendor/tree-sitter-nix/' from commit '470b15a60520ff7b86f51732b8d8f1118c86041e' 
git-subtree-dir: vendor/tree-sitter-nix
git-subtree-mainline: df5c044259
git-subtree-split: 470b15a605
 2022-03-29 22:22:45 +07:00
Wilfred Hughes df5c044259
Merge pull request #188 from JafarAbdi/pr-add_lua_parser 
Add lua support
 2022-03-29 22:08:16 +07:00
Jafar eb29b824c3
Merge branch 'master' into pr-add_lua_parser 2022-03-30 06:23:20 +07:00
JafarAbdi b850d41fa5 Add lua support 2022-03-30 06:21:10 +07:00
Wilfred Hughes 646ab39cbb Mention that Janet is supported 2022-03-29 19:50:25 +07:00
Wilfred Hughes 48cf4ece6d
Merge pull request #190 from sogaiu/janet-subtree 
Add Janet support
 2022-03-29 19:32:44 +07:00
Wilfred Hughes 9ee7991bda
Merge pull request #198 from felixonmars/patch-1 
Correct a typo in tricky_cases.md
 2022-03-29 19:26:34 +07:00
Felix Yan d92cb9633f
Correct a typo in tricky_cases.md 2022-03-30 02:23:07 +07:00
sogaiu e1e735752d Add sample files and update compare.expected 2022-03-29 14:53:10 +07:00
Wilfred Hughes d36224229e Downgrade rpds to last Rust 2018 version 
This will allow difftastic to build on earlier rust versions, and is
also a ~2% instruction count reduction on slow_before.rs.
 2022-03-28 22:23:42 +07:00
sogaiu 5696ef6016 Change name shown to users 2022-03-29 14:20:23 +07:00
sogaiu 9ed951044a Format via cargo fmt 2022-03-29 14:14:07 +07:00
sogaiu 5ecc0fbde5 Add janet support 2022-03-29 10:22:14 +07:00
sogaiu 4b397024cb Add 'vendor/tree-sitter-janet-simple/' from commit 'e6c04e4b243cf3e5aca8f201e48926a72cc18334' 
git-subtree-dir: vendor/tree-sitter-janet-simple
git-subtree-mainline: f26ca24df7
git-subtree-split: e6c04e4b24
 2022-03-29 10:12:42 +07:00
sogaiu e6c04e4b24 Release 0.0.3 2022-03-29 10:00:03 +07:00
JafarAbdi 02fd04189c Add 'vendor/tree-sitter-lua/' from commit '6f5d40190ec8a0aa8c8410699353d820f4f7d7a6' 
git-subtree-dir: vendor/tree-sitter-lua
git-subtree-mainline: f26ca24df7
git-subtree-split: 6f5d40190e
 2022-03-28 18:07:10 +07:00
sogaiu 784a9afca5 Add comment-handling to highlights.scm 2022-03-28 16:13:21 +07:00
Wilfred Hughes f26ca24df7 Discard '\n' nodes in C and C++ 
These are from the preprocessor grammar rules, but they're not useful
for difftastic.

Reported upstream: https://github.com/tree-sitter/tree-sitter-c/issues/97

Closes #180
 2022-03-27 23:37:23 +07:00
Wilfred Hughes a189f49a5e Return a vec of syntax nodes when converting tree-sitter to difftastic 2022-03-27 23:19:56 +07:00
sogaiu aceea17420 Add queries/highlights.scm 2022-03-28 15:17:45 +07:00
sogaiu 12e2b7a0fa Fix rust binding 2022-03-28 15:17:29 +07:00
Wilfred Hughes 065a11ee2c Clarify textual diffing approach 2022-03-27 18:43:31 +07:00
Wilfred Hughes b66bb9ea96 Group debug options in help text 2022-03-27 00:01:55 +07:00
Wilfred Hughes ced7708426 Tweak wording as --background doesn't take a colour argument 2022-03-26 23:54:12 +07:00
Wilfred Hughes b6cd8c9a42 Update Clojure highlighting to match upstreamed PR 
See https://github.com/sogaiu/tree-sitter-clojure/pull/20
 2022-03-26 23:50:55 +07:00
Wilfred Hughes ec2b72bff2 Update regression tests for previous commit 2022-03-26 23:50:33 +07:00
Wilfred Hughes 1d7324c2dc Clarify wording when a parsed file has no changes at all 2022-03-26 23:31:12 +07:00
Wilfred Hughes 92b9680ecd Define a scala.scm of highlighting queries 2022-03-26 23:26:21 +07:00
Wilfred Hughes 5b1bc62ac6 Don't show hunk numbers when there's only one hunk 
Related: #60
 2022-03-26 22:52:04 +07:00
Wilfred Hughes bacefe5a58 Roll version 2022-03-26 16:02:51 +07:00
Wilfred Hughes c15ba1e75a New screenshots and add screencast demo 2022-03-26 15:46:41 +07:00
Wilfred Hughes 1a8d7d06a7 Store previous_sibling in SyntaxInfo 2022-03-24 21:57:13 +07:00
Wilfred Hughes 59ee169ddc Remove leftover debug logging 2022-03-24 21:27:27 +07:00
Wilfred Hughes 807be70e31 Factor out a helper function for splitting unchanged singleton lists 2022-03-24 21:20:46 +07:00
Wilfred Hughes 870806c017 Log the number of toplevel nodes too 
This is computationally cheaper than calculating depth, and it gives a
good hint regarding depth (fewer toplevel nodes: depth is probably
deeper).

Fixes #159
 2022-03-23 22:59:39 +07:00
Wilfred Hughes 2b36a755f0 Ensure that blank lines in multiline strings are shown as changed 
Fixes #121
 2022-03-23 22:47:17 +07:00
Wilfred Hughes 886c0964ff Treat shebangs in dart as atoms 
E.g. given:

    #! /usr/bin/env dshell

tree-sitter AST doesn't have positions for the `/usr/bin/env dshell`
part, so treat it all as an atom.
 2022-03-23 22:13:45 +07:00
Wilfred Hughes f15ec6d637 Lower the default node limit for tree diffing 
Fixes #176
 2022-03-22 21:15:54 +07:00
Wilfred Hughes 4647112e93 Define a highlighting file for Clojure 
This isn't provided upstream, and the parse tree doesn't have a lot of
information, but we can at least handle string literals and keywords.
 2022-03-22 21:08:46 +07:00