Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Add default diff support (#732)
  • Loading branch information
CosmicHorrorDev committed Jan 18, 2023
1 parent db073d8 commit d5b3291
Show file tree
Hide file tree
Showing 5 changed files with 52 additions and 0 deletions.
12 changes: 12 additions & 0 deletions lexers/embedded/diff.xml
Expand Up @@ -14,6 +14,18 @@
<rule pattern=" .*\n">
<token type="Text"/>
</rule>
<rule pattern="\d+(,\d+)?(a|c|d)\d+(,\d+)?\n">
<token type="GenericSubheading"/>
</rule>
<rule pattern="---\n">
<token type="GenericStrong"/>
</rule>
<rule pattern="&lt; .*\n">
<token type="GenericDeleted"/>
</rule>
<rule pattern="&gt; .*\n">
<token type="GenericInserted"/>
</rule>
<rule pattern="\+.*\n">
<token type="GenericInserted"/>
</rule>
Expand Down
9 changes: 9 additions & 0 deletions lexers/testdata/diff/default.actual
@@ -0,0 +1,9 @@
1,2d0
< A
< A
4c2
< C
---
> F
5a4
> E
10 changes: 10 additions & 0 deletions lexers/testdata/diff/default.expected
@@ -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"}
]
10 changes: 10 additions & 0 deletions lexers/testdata/diff/unified.actual
@@ -0,0 +1,10 @@
--- old.txt 2023-01-17 21:02:15.449417575 -0700
+++ new.txt 2023-01-17 21:02:12.489441682 -0700
@@ -1,5 +1,4 @@
-A
-A
B
-C
+F
D
+E
11 changes: 11 additions & 0 deletions lexers/testdata/diff/unified.expected
@@ -0,0 +1,11 @@
[
{"type":"GenericDeleted","value":"--- old.txt\t2023-01-17 21:02:15.449417575 -0700\n"},
{"type":"GenericInserted","value":"+++ new.txt\t2023-01-17 21:02:12.489441682 -0700\n"},
{"type":"GenericSubheading","value":"@@ -1,5 +1,4 @@\n"},
{"type":"GenericDeleted","value":"-A\n-A\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"}
]

0 comments on commit d5b3291

Please sign in to comment.