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

3013 Commits (d99ada157308eb34a122004a67c68c3be5f77a85)
 

Author SHA1 Message Date
Wilfred Hughes 1de7c10a56 Fix column number alignments in inline diff mode 2021-08-08 00:43:18 +07:00
Wilfred Hughes 2a905e28bc Allow storing opposite position on unchanged comment parts 2021-08-08 00:04:05 +07:00
Wilfred Hughes 42425532c7 Use reversed positions after computing them 2021-08-07 16:40:32 +07:00
Wilfred Hughes bbb0f2fcba Store opposite position on unchanged matched positions 2021-08-07 16:14:16 +07:00
Wilfred Hughes 3a1e34160f Fix typo 2021-08-07 13:28:55 +07:00
Wilfred Hughes 98e02f2d9d Move side-by-side logic from lines.rs to side_by_side.rs 2021-08-07 12:27:57 +07:00
Wilfred Hughes d07b97a3ec More inline diff context fixes 2021-08-04 23:49:07 +07:00
Wilfred Hughes a7063c97c7 Allow copying and/or cloning of match information 2021-08-04 23:48:45 +07:00
Wilfred Hughes 2dcb265d76 Inline diff: correct line number for RHS trailing context 2021-08-04 23:40:03 +07:00
Wilfred Hughes cebd377163 Apply inline colours to inline diff 2021-08-04 23:36:09 +07:00
Wilfred Hughes c39b2677e0 Tweak whitespace in inline diff 2021-08-04 23:30:38 +07:00
Wilfred Hughes 85fae3cfe9 Inline display: print RHS context after changed lines 2021-08-04 23:30:13 +07:00
Wilfred Hughes cbea00e6a6 Add todo 2021-08-04 23:25:27 +07:00
Wilfred Hughes c43206624d cargo fmt 2021-08-04 00:17:07 +07:00
Wilfred Hughes 01b5197b0a Adding context boundary calculations to inline display 2021-08-03 23:59:40 +07:00
sogaiu 3b80140427 Update README 2021-08-03 14:26:26 +07:00
Wilfred Hughes f2629abe2c Experimenting with colouring line numbers based on LHS/RHS modified state 2021-08-01 23:55:24 +07:00
Wilfred Hughes cc77dae1f0 Silence clippy warning 2021-08-01 23:27:32 +07:00
Wilfred Hughes 07605434cc Use bold for inline display for consistency with side-by-side 2021-08-01 17:05:05 +07:00
Wilfred Hughes d3c50a7a09 Don't display RHS lines before the first change of a hunk 2021-08-01 17:03:38 +07:00
Wilfred Hughes 83a840869c Initial red/green printing of changed lines for inline display 2021-08-01 16:40:07 +07:00
Wilfred Hughes 8c97fc2484 Pad groups in both modes and print lines of content in inline mode 2021-08-01 16:26:18 +07:00
Wilfred Hughes e9e072af01 Remove completed todo 2021-08-01 16:19:28 +07:00
Wilfred Hughes f54ef7d477 Add TODO 2021-08-01 16:15:54 +07:00
Wilfred Hughes 4a618f3c16 Prefer LineNumber wrappers when passing line numbers to formatters 2021-08-01 16:14:25 +07:00
Wilfred Hughes c46ef92cd5 Stub implementation for inline display 2021-08-01 16:12:44 +07:00
Wilfred Hughes af7fdadf26 Define an inline diff module 2021-08-01 16:07:45 +07:00
Wilfred Hughes 3e0b3b6d41 Define an environment variable for controlling output format 2021-08-01 16:06:15 +07:00
Wilfred Hughes ae9df2c55a Move side-by-side diff display to a separate module 2021-08-01 15:40:47 +07:00
Wilfred Hughes 1ceaecfa25 Remove --width from CLI parameters 
This is the first step in refactoring for inline diffs.
 2021-08-01 15:30:12 +07:00
Wilfred Hughes 7a61048056 Simplify pattern match for edge costs 2021-07-31 23:33:44 +07:00
Wilfred Hughes 2e6666041f Contiguous novel atoms are always better than changing depth of novel lists 2021-07-31 23:32:23 +07:00
Wilfred Hughes 04c37b3865 Ensure NovelTree edges have costs consistent with novel atoms 
This was broken in 573cd32a01, which
only increased novel atom/delimiter costs.
 2021-07-31 21:52:54 +07:00
Wilfred Hughes 4161d80f2f Simplify text display of language type 2021-07-31 17:30:37 +07:00
Wilfred Hughes 34f084d8f1 Calculate content width based on visible lines 2021-07-31 17:21:55 +07:00
Wilfred Hughes e67732bab9 Improve contiguous novel logic 
Inspect the previous syntactic node, then get the atom position, open
delimiter position or close delimiter position depending on the
context.
 2021-07-31 16:54:14 +07:00
Wilfred Hughes 017c9fb6d8 Define a num_ancestors helper 2021-07-31 16:38:15 +07:00
Wilfred Hughes 444256b3d5 Silence a lossless cast lint from clippy 2021-07-31 12:07:52 +07:00
Wilfred Hughes e4feb734d4 Formatting 2021-07-31 12:07:46 +07:00
Wilfred Hughes 8de611ae0a Also store the previous syntax node in SyntaxInfo 2021-07-31 12:03:56 +07:00
Wilfred Hughes 692ad90073 Adding TODO 2021-07-31 11:37:02 +07:00
Wilfred Hughes ca5e757065 Document OrdVertex fields and improve names 2021-07-31 11:26:03 +07:00
Wilfred Hughes 7ac433acb4 Prefer named struct fields 2021-07-31 11:20:09 +07:00
Wilfred Hughes 7b87434635 Document the purpose of the prev_novel fields 2021-07-31 11:10:17 +07:00
Wilfred Hughes 4f4dfb846e Fix typo 2021-07-31 11:04:59 +07:00
Wilfred Hughes 59f4b9e0d7 Reorder fields in Vertex 2021-07-31 11:01:39 +07:00
Wilfred Hughes 332aff3810 Don't bother considering ReplacedComment for identical comments 
It will never be on the shortest path.
 2021-07-31 10:57:14 +07:00
Wilfred Hughes 1553533559 Add a sample file exercising contiguous item logic 2021-07-31 10:50:02 +07:00
Wilfred Hughes 5b440a69b3 Link to edges directly 2021-07-31 10:29:48 +07:00
Wilfred Hughes a4751b98f1 Fix a parsing issue with -> in Rust 2021-07-31 01:25:16 +07:00