highlight change headers

connects helix-editor/helix#1338 (comment)
the-mikedavis · Dec 22, 2021 · 8499604 · 8499604
1 parent 6f00dd1
commit 8499604
Show file tree

Hide file tree

Showing 6 changed files with 1,163 additions and 788 deletions.
diff --git a/grammar.js b/grammar.js
@@ -77,11 +77,18 @@ module.exports = grammar({
           "'."
         ),
         seq("HEAD", "detached", "at", $.commit),
+        $.header,
         $.change,
         // fallback to regular comment words if the words are nonsense
         repeat1($._word)
       ),
 
+    header: ($) =>
+      choice(
+        seq("Conflicts", ":"),
+        seq("Changes", "to", "be", "committed", ":")
+      ),
+
     change: ($) =>
       seq(
         field("kind", CHANGE),

diff --git a/src/grammar.json b/src/grammar.json
@@ -321,6 +321,10 @@
             }
           ]
         },
+        {
+          "type": "SYMBOL",
+          "name": "header"
+        },
         {
           "type": "SYMBOL",
           "name": "change"
@@ -334,6 +338,49 @@
         }
       ]
     },
+    "header": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "STRING",
+              "value": "Conflicts"
+            },
+            {
+              "type": "STRING",
+              "value": ":"
+            }
+          ]
+        },
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "STRING",
+              "value": "Changes"
+            },
+            {
+              "type": "STRING",
+              "value": "to"
+            },
+            {
+              "type": "STRING",
+              "value": "be"
+            },
+            {
+              "type": "STRING",
+              "value": "committed"
+            },
+            {
+              "type": "STRING",
+              "value": ":"
+            }
+          ]
+        }
+      ]
+    },
     "change": {
       "type": "SEQ",
       "members": [

diff --git a/src/node-types.json b/src/node-types.json
@@ -56,10 +56,19 @@
         {
           "type": "commit",
           "named": true
+        },
+        {
+          "type": "header",
+          "named": true
         }
       ]
     }
   },
+  {
+    "type": "header",
+    "named": true,
+    "fields": {}
+  },
   {
     "type": "message",
     "named": true,
@@ -128,6 +137,14 @@
     "type": ":",
     "named": false
   },
+  {
+    "type": "Changes",
+    "named": false
+  },
+  {
+    "type": "Conflicts",
+    "named": false
+  },
   {
     "type": "HEAD",
     "named": false
@@ -144,6 +161,10 @@
     "type": "at",
     "named": false
   },
+  {
+    "type": "be",
+    "named": false
+  },
   {
     "type": "branch",
     "named": true
@@ -156,6 +177,10 @@
     "type": "commit",
     "named": true
   },
+  {
+    "type": "committed",
+    "named": false
+  },
   {
     "type": "date",
     "named": false