From db9dbeda39d0f74fe6cec611b8e7df27edc8a915 Mon Sep 17 00:00:00 2001
From: Lovecraftian Horror <LovecraftianHorror@pm.me>
Date: Tue, 17 Jan 2023 21:45:00 -0700
Subject: [PATCH 1/3] feat: Add support for default diff syntax

---
 lexers/embedded/diff.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lexers/embedded/diff.xml b/lexers/embedded/diff.xml
index c10963e21..dc0beb7fd 100644
--- a/lexers/embedded/diff.xml
+++ b/lexers/embedded/diff.xml
@@ -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>

From 62a12a4ac74ad0f0b82335b54c0156f6a11c56ec Mon Sep 17 00:00:00 2001
From: Lovecraftian Horror <LovecraftianHorror@pm.me>
Date: Tue, 17 Jan 2023 21:47:03 -0700
Subject: [PATCH 2/3] chore: Basic tests for all supported diff styles

---
 lexers/testdata/diff/default.actual   |  9 +++++++++
 lexers/testdata/diff/default.expected | 10 ++++++++++
 lexers/testdata/diff/unified.actual   | 12 ++++++++++++
 lexers/testdata/diff/unified.expected | 12 ++++++++++++
 4 files changed, 43 insertions(+)
 create mode 100644 lexers/testdata/diff/default.actual
 create mode 100644 lexers/testdata/diff/default.expected
 create mode 100644 lexers/testdata/diff/unified.actual
 create mode 100644 lexers/testdata/diff/unified.expected

diff --git a/lexers/testdata/diff/default.actual b/lexers/testdata/diff/default.actual
new file mode 100644
index 000000000..37e44125b
--- /dev/null
+++ b/lexers/testdata/diff/default.actual
@@ -0,0 +1,9 @@
+1,2d0
+< A
+< A
+4c2
+< C
+---
+> F
+5a4
+> E
diff --git a/lexers/testdata/diff/default.expected b/lexers/testdata/diff/default.expected
new file mode 100644
index 000000000..9e29b15cd
--- /dev/null
+++ b/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"}
+]
diff --git a/lexers/testdata/diff/unified.actual b/lexers/testdata/diff/unified.actual
new file mode 100644
index 000000000..36bd7a320
--- /dev/null
+++ b/lexers/testdata/diff/unified.actual
@@ -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
diff --git a/lexers/testdata/diff/unified.expected b/lexers/testdata/diff/unified.expected
new file mode 100644
index 000000000..66a387227
--- /dev/null
+++ b/lexers/testdata/diff/unified.expected
@@ -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"}
+]

From fc35c5317865b11afb27d50980c94f92f2b8accc Mon Sep 17 00:00:00 2001
From: Lovecraftian Horror <LovecraftianHorror@pm.me>
Date: Tue, 17 Jan 2023 22:05:31 -0700
Subject: [PATCH 3/3] refactor: Use same base diff for both tests

---
 lexers/testdata/diff/unified.actual   | 10 ++++------
 lexers/testdata/diff/unified.expected |  9 ++++-----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/lexers/testdata/diff/unified.actual b/lexers/testdata/diff/unified.actual
index 36bd7a320..dc7cf07c5 100644
--- a/lexers/testdata/diff/unified.actual
+++ b/lexers/testdata/diff/unified.actual
@@ -1,10 +1,8 @@
---- old.txt	2023-01-17 20:59:02.687400701 -0700
-+++ new.txt	2023-01-17 21:00:40.760132465 -0700
-@@ -1,4 +1,7 @@
+--- 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
diff --git a/lexers/testdata/diff/unified.expected b/lexers/testdata/diff/unified.expected
index 66a387227..79c717c98 100644
--- a/lexers/testdata/diff/unified.expected
+++ b/lexers/testdata/diff/unified.expected
@@ -1,9 +1,8 @@
 [
-  {"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":"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"},