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

15108 Commits (42f69025d390ba6f4bf1309dec9aacd331b4fa61)
 

Author SHA1 Message Date
Wilfred Hughes 42f69025d3
Merge pull request #744 from staeff/patch-1 
Fix typo
 2024-07-27 13:54:50 +07:00
Stephan Klinger 7bc92290d1
Fix typo 2024-07-26 21:30:46 +07:00
Wilfred Hughes 5a51c02157 Fix crash when the last hunk includes the trailing newline at EOF 
Input cleaning should happen before we diff the content, not during
display. Previously display would crash due to line numbers
referencing the line that had been stripped.

Fixes #713
Fixes #739
Fixes #742
 2024-07-26 08:54:20 +07:00
Wilfred Hughes 954979b19f
Merge pull request #659 from hugo-vrijswijk/update-scala-treesitter 
update scala treesitter
 2024-07-23 07:08:49 +07:00
Hugo van Rijswijk df76ea2369 Update compare result 2024-07-23 12:55:49 +07:00
Hugo van Rijswijk 20db4283e7 Merge commit 'a13f2d1ee9609cc5c4c8ffce9640c353b77a24d8' 
# Conflicts:
#	vendored_parsers/tree-sitter-scala/queries/scala/highlights.scm
 2024-07-23 12:49:30 +07:00
Wilfred Hughes 78650c310a Improve accuracy of conservative width estimation optimisation 2024-07-21 11:37:27 +07:00
Wilfred Hughes c2f4b1f2ee Update tests and changelog for 1e8be4558b 2024-07-21 11:15:54 +07:00
Wilfred Hughes 92fa3fb3de Ensure files with no common content are aligned 2024-07-20 23:43:04 +07:00
Wilfred Hughes 1e8be4558b Fix performance when splitting very long lines during display 2024-07-20 23:38:16 +07:00
Wilfred Hughes 9b6bc7486f Fix invocation of flamegraph command in manual 2024-07-20 23:38:16 +07:00
Wilfred Hughes fa2ec359d7 Roll version 2024-07-20 16:11:55 +07:00
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
eugene yokota a13f2d1ee9
Merge pull request #405 from eed3si9n/wip/array 
refactor(scanner): use new array header for stack
 2024-07-17 14:56:27 +07:00
Amaan Qureshi 3fb3931142 refactor(scanner): use new array header for stack 2024-07-17 11:36:47 +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
eugene yokota 599d12b59f
Merge pull request #402 from eed3si9n/wip/corpus 
Move corpus
 2024-06-30 17:57:27 +07:00
Eugene Yokota a6e8f24623 Move corpus 
**Problem/Solution**
I noticed that corpus tests weren't running.
Apparently tree-sitter 0.22.0 moved the directory -https://github.com/tree-sitter/tree-sitter/releases/tag/v0.22.0
 2024-06-30 17:52:41 +07:00
Wilfred Hughes 27a0cfba16 Silence some clippy warnings 2024-06-29 23:08:11 +07:00
eugene yokota de465b0fd6
Merge pull request #401 from eed3si9n/wip/smoke 
Bump smoke test targets
 2024-06-29 23:08:45 +07:00
Eugene Yokota ae91190a6f Bump smoke test targets 
**Problem**
We currently use scala/scala and scala/scala3 to run the smoke test,
but the versions are slightly older.

**Solution**
1. This bumps the versions to latest. Thankfully not much regression on the percentage.
2. This also adds lila for testing.
 2024-06-29 23:04:18 +07:00
Marcel 759797c851 guess_language: add flake.lock as json 2024-06-27 08:09:28 +07:00
eugene yokota 5bce09bdd9
Merge pull request #400 from tree-sitter/generation 
chore: generate and sync latest changes
 2024-06-22 13:57:24 +07:00
GitHub 9b739bec82 chore: generate and sync from 3080c54e22 2024-06-22 17:54:00 +07:00
eugene yokota 3080c54e22
Merge pull request #379 from eed3si9n/wip/tree-sitter-bump 
Update tree-sitter to 0.22.6
 2024-06-22 13:52:49 +07:00
Eugene Yokota 4941073198 tree-sitter 0.22.6 2024-06-22 12:25:54 +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