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

115 Commits (12bc7f7de4bfd4265225ec0142b71d273ec7671f)

Author SHA1 Message Date
Wilfred Hughes 6b24e28c28 Add support for TOML 2022-04-14 21:21:36 +07:00
Wilfred Hughes 1a93162740 Fix block sclars in YAML 2022-04-14 18:45:48 +07:00
Wilfred Hughes 47fe0cfc42 Add some more common keyword-ish capture names for highlighters 2022-04-14 00:40:09 +07:00
Wilfred Hughes b3872e6513 Add syntax highlighting and regression test for Kotlin 2022-04-14 00:38:44 +07:00
Wilfred Hughes 059fc824ff Add Kotlin support 
Closes #220
 2022-04-14 00:21:29 +07:00
Wilfred Hughes 1830d286e0 Ensure unchanged MatchedPos have the same number on LHS and RHS 
Fixes #246
 2022-04-09 21:12:31 +07:00
Wilfred Hughes 1c9ae2fbc6 Fix parsing of built-in Zig identifiers 
Fixes #248
 2022-04-09 19:38:07 +07:00
Wilfred Hughes 053de5acbe Update to Clojure parser with separate symbol positions 
See discussion in https://github.com/sogaiu/tree-sitter-clojure/issues/21
 2022-04-09 12:41:49 +07:00
Wilfred Hughes 838ad0c048 Add regression test for #181 2022-04-09 12:18:51 +07:00
Wilfred Hughes 1c416733ef Fix nested sliders in C-like languages 
Improves #165
 2022-04-08 09:41:56 +07:00
Wilfred Hughes bdb68cd676 Support @boolean and @character highlighting queries 2022-04-03 22:36:15 +07:00
Wilfred Hughes 10a0e2dba9 Improve YAML handling 
Fix atom handling and add syntax highlighting
 2022-04-03 22:26:33 +07:00
Wilfred Hughes 9245aada8f Merge remote-tracking branch 'alexmanno/add_yaml_support' 
Closes #208
 2022-04-03 22:08:44 +07:00
Alex Perkins f5ab6e7e86
add newline to module exports 2022-04-03 21:37:17 +07:00
Alex Perkins d6e9afd3d6 add support for Elm 2022-04-03 20:18:33 +07:00
Wilfred Hughes 01678f8556 Don't pad the right column in side-by-side display 
Helps with #209 too.
 2022-04-03 11:30:19 +07:00
Wilfred Hughes 81db99e51e Update regression test for Gleam 2022-04-03 10:50:54 +07:00
Wilfred Hughes 28c6e35943 Merge #205 2022-04-02 17:18:59 +07:00
Jacob Rothstein 9945270f4b
add gleam 
# Conflicts:
#	CHANGELOG.md
#	README.md
 2022-03-31 14:08:05 +07:00
Andrew Gutekanst 6c2504a34f Add expected Zig diff results for CI check 2022-03-31 12:38:17 +07:00
Andrew Gutekanst 7f2efa1af9 Add Zig support 2022-03-30 23:32:48 +07:00
Alessandro Manno b2dd6c5aa8
fixed compare.expected 2022-03-30 19:36:27 +07:00
Alessandro Manno ffddaa645e
Added yaml support 2022-03-30 12:43:01 +07:00
Wilfred Hughes ecdf993ff1 Add support for Nix 
Closes #196
 2022-03-29 22:46:09 +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
sogaiu e1e735752d Add sample files and update compare.expected 2022-03-29 14:53:10 +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 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 2b36a755f0 Ensure that blank lines in multiline strings are shown as changed 
Fixes #121
 2022-03-23 22:47:17 +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
Wilfred Hughes 9e32e2e08e Ensure matched lines includes blanks at the ends of the file 
Fixes #163
 2022-03-20 22:31:32 +07:00
Wilfred Hughes a18dce036a Handle novel MatchedPos values that have unchanged values on the same line 
Fixes #169
 2022-03-20 15:03:22 +07:00
Wilfred Hughes 29050f00ce Configure language and fix highlighting for dart 2022-03-20 11:36:12 +07:00
Ömer Sinan Ağacan fb73c84960 Add a Dart sample 2022-03-20 11:07:39 +07:00
Wilfred Hughes e38d14a144 Prefer aligning blank lines in display 
After we've aligned lines based on diff results, we have intermediate
lines that we need to align somehow. Previously, we'd just take them
in order, aligning the first on the LHS with the first on the RHS and
so on.

If the intermediate lines start or end with a sequence of blank lines,
prefer aligning the blank lines. If we have both, arbitrarily choose
the ending blank lines.

This has produced better results in many of the sample files, although
in the case of slow_before.rs we've just changed from a leading blank
line alignment to a trailing blank line alignment.
 2022-03-17 22:16:45 +07:00
Wilfred Hughes 6d58247465 Preserve the outer delimiter when shrinking 
Previously, we'd always discard the outer delimiter if it matched on
both sides. This prevented the tree diff finding optimal diffs.

Fixes #124
 2022-03-16 23:38:05 +07:00
Wilfred Hughes 40d3ccd06c Fix confusion between byte length and codepoint length in styling 
We should split lines based on their codepoint length, so all our
lengths are on codepoint boundaries. We can then safely index by byte position.

All the positions are measured in bytes, not code points. Tweak
function names to make this explicit.

Fixes #149
 2022-03-15 09:50:13 +07:00
Wilfred Hughes b2229d66a8 Always display all lines in a hunk 
Previously we were assuming that the first/last line pairs in a hunk
contained the earliest/latest lines on both sides. This isn't true
when there are no common items between the lines.

This fixes some display issues in load_before/after.js, but include a
new integration test that is smaller and easier to eyeball.

Fixes #133
 2022-03-15 00:11:30 +07:00
Wilfred Hughes c0d1faae63 Keep exploring the graph even when we find matched delimiters 
Previously we'd get tripped up by cases where choosing equal
delimiters would be be considered the same as entering each delimiter
separately, making diffs worse.

Fixes #147
 2022-03-13 15:41:54 +07:00
Wilfred Hughes 2f8ccd94da Add sample file showing slow perf large adjacent lists 
Part of #156.
 2022-03-12 11:28:28 +07:00
Wilfred Hughes 17ff2bc07e < and > are delimiters in Rust and C++ 2022-03-08 20:42:57 +07:00
Wilfred Hughes 88ae00bd88 Use depth difference as a heuristic when comparing equal nodes 
This reverts commit 7544874a55. It turns
out there are cases where this is still necessary (see new sample
file). It's also performance neutral.

This bug became more obvious with the recent 'skip unchanged'
optimisations. The optimisation changed the number of preceeding nodes and
exposed this bug more often.
 2022-03-08 09:44:55 +07:00
Wilfred Hughes 6f65bbbbb0 Merge branch 'delim_type' 
Introduce a new type EnteredDelimiter that tracks entering/leaving
list nodes. The PopEither and PopBoth cases reflect the choices more
accurately than a 2-tuple of options.

This is a performance hit (slow_before.rs runtime has increased by
49%) but it's important for diff correctness.

Fixes #147
 2022-03-06 21:39:15 +07:00
Wilfred Hughes e134257f78 Fix syntax error in clojure example program 2022-03-05 16:31:47 +07:00
Wilfred Hughes 44b2f6b6ec Update regression tests for empty atom change in previous commit 2022-03-05 16:31:30 +07:00