Skip to content

Add default diff support #732

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 18, 2023
Merged

Add default diff support #732

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db9dbed
feat: Add support for default diff syntax
CosmicHorrorDev Jan 18, 2023
62a12a4
chore: Basic tests for all supported diff styles
CosmicHorrorDev Jan 18, 2023
fc35c53
refactor: Use same base diff for both tests
CosmicHorrorDev Jan 18, 2023
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: Basic tests for all supported diff styles
  • Loading branch information
@CosmicHorrorDev
CosmicHorrorDev committed Jan 18, 2023
commit 62a12a4ac74ad0f0b82335b54c0156f6a11c56ec
9 changes: 9 additions & 0 deletions lexers/testdata/diff/default.actual
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
1,2d0
< A
< A
4c2
< C
---
> F
5a4
> E
10 changes: 10 additions & 0 deletions lexers/testdata/diff/default.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[
{"type":"GenericSubheading","value":"1,2d0\n"},
{"type":"GenericDeleted","value":"\u003c A\n\u003c A\n"},
{"type":"GenericSubheading","value":"4c2\n"},
{"type":"GenericDeleted","value":"\u003c C\n"},
{"type":"GenericStrong","value":"---\n"},
{"type":"GenericInserted","value":"\u003e F\n"},
{"type":"GenericSubheading","value":"5a4\n"},
{"type":"GenericInserted","value":"\u003e E\n"}
]
12 changes: 12 additions & 0 deletions lexers/testdata/diff/unified.actual
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
--- old.txt 2023-01-17 20:59:02.687400701 -0700
+++ new.txt 2023-01-17 21:00:40.760132465 -0700
@@ -1,4 +1,7 @@
-A
+
+
+
B
-C
+F
D
+E
12 changes: 12 additions & 0 deletions lexers/testdata/diff/unified.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[
{"type":"GenericDeleted","value":"--- old.txt\t2023-01-17 20:59:02.687400701 -0700\n"},
{"type":"GenericInserted","value":"+++ new.txt\t2023-01-17 21:00:40.760132465 -0700\n"},
{"type":"GenericSubheading","value":"@@ -1,4 +1,7 @@\n"},
{"type":"GenericDeleted","value":"-A\n"},
{"type":"GenericInserted","value":"+\n+\n+\n"},
{"type":"Text","value":" B\n"},
{"type":"GenericDeleted","value":"-C\n"},
{"type":"GenericInserted","value":"+F\n"},
{"type":"Text","value":" D\n"},
{"type":"GenericInserted","value":"+E\n"}
]