diff --git a/build.zig.zon b/build.zig.zon index 0278064b44..2105205390 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -74,8 +74,8 @@ .hash = "zig_compile_commands-0.0.1-OZg5-e_JAAAGg1WHAePtq4l4Uvjs34BexnFFCZk63EaG", }, .treesitter_diff = .{ - .url = "git+https://github.com/tree-sitter-grammars/tree-sitter-diff?ref=v0.1.0#2520c3f934b3179bb540d23e0ef45f75304b5fed", - .hash = "N-V-__8AAAULEwDDBPj9cGOTHPT1iE6oZabnwo70bstgVEf_", + .url = "git+https://github.com/tree-sitter-grammars/tree-sitter-diff?ref=v0.2.0#ada384ac7bfc1307f32de474620120add29998fb", + .hash = "N-V-__8AAPUcFACL4N4XTVUilDAwPIkX8066VSaipW5tYXDT", }, }, .paths = .{ diff --git a/cmake.deps/deps.txt b/cmake.deps/deps.txt index 196d90f4ee..6db0768a54 100644 --- a/cmake.deps/deps.txt +++ b/cmake.deps/deps.txt @@ -35,8 +35,8 @@ UTF8PROC_SHA256 abfed50b6d4da51345713661370290f4f4747263ee73dc90356299dfc7990c78 TREESITTER_C_URL https://github.com/tree-sitter/tree-sitter-c/archive/v0.24.2.tar.gz TREESITTER_C_SHA256 2eeb4db31f8fa0865e45488503d13403923bcb485a1bdb637abff8c42dd97364 -TREESITTER_DIFF_URL https://github.com/tree-sitter-grammars/tree-sitter-diff/archive/v0.1.0.tar.gz -TREESITTER_DIFF_SHA256 0d0414ac873c33154b458f4d62fe096aa966392ff416920a08c5629c765aaed3 +TREESITTER_DIFF_URL https://github.com/tree-sitter-grammars/tree-sitter-diff/archive/v0.2.0.tar.gz +TREESITTER_DIFF_SHA256 6092f7fd11e186d96d3c130fdbe8d03cfc426ee9cc62cf4a2112571b1b0372e6 TREESITTER_LUA_URL https://github.com/tree-sitter-grammars/tree-sitter-lua/archive/v0.5.0.tar.gz TREESITTER_LUA_SHA256 cf01b93f4b61b96a6d27942cf28eeda4cbce7d503c3bef773a8930b3d778a2d9 TREESITTER_LUA_WASM_URL https://github.com/tree-sitter-grammars/tree-sitter-lua/releases/download/v0.5.0/tree-sitter-lua.wasm diff --git a/runtime/queries/diff/highlights.scm b/runtime/queries/diff/highlights.scm index 54c57a8070..a4e70dd273 100644 --- a/runtime/queries/diff/highlights.scm +++ b/runtime/queries/diff/highlights.scm @@ -10,6 +10,8 @@ (old_file) ] @diff.minus +(change) @diff.delta + (commit) @constant (location) @attribute @@ -20,6 +22,10 @@ (filename) @string.special.path +(special) @string.special + +"\\" @punctuation.special + (mode) @number ([ @@ -28,16 +34,20 @@ "++" "+++" "++++" + ">" "-" "--" "---" "----" + "<" + "!" ] @punctuation.special (#set! priority 95)) [ (binary_change) (similarity) + (dissimilarity) (file_change) ] @label @@ -47,3 +57,27 @@ (similarity (score) @number "%" @number) + +(dissimilarity + (score) @number + "%" @number) + +(binary_patch + [ + "GIT" + "binary" + "patch" + ] @label) + +(binary_hunk + [ + "literal" + "delta" + ] @keyword + (size) @number) + +forward: (binary_hunk + (payload) @diff.plus) + +reverse: (binary_hunk + (payload) @diff.minus)