alias rebase headers to $.header, not $.summary

the-mikedavis · Dec 24, 2021 · 5cd4776 · 5cd4776
1 parent f0cb000
commit 5cd4776
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 41 deletions.
diff --git a/grammar.js b/grammar.js
@@ -66,7 +66,7 @@ module.exports = grammar({
 
     _comment_body: ($) =>
       choice(
-        $._rebase_summary,
+        alias($._rebase_summary, $.summary),
         $.summary,
         $._branch_declaration,
         // fallback to regular comment words if the words are nonsense
@@ -85,9 +85,9 @@ module.exports = grammar({
           $.commit,
           NEWLINE
         ),
-        seq("#", alias($._rebase_header, $.summary), NEWLINE),
+        seq("#", alias($._rebase_header, $.header), NEWLINE),
         repeat(seq("#", $.rebase_command, NEWLINE)),
-        seq("#", alias($._rebase_header, $.summary), NEWLINE),
+        seq("#", alias($._rebase_header, $.header), NEWLINE),
         repeat(seq("#", $.rebase_command, NEWLINE)),
         seq(
           "#",

diff --git a/src/grammar.json b/src/grammar.json
@@ -210,8 +210,13 @@
       "type": "CHOICE",
       "members": [
         {
-          "type": "SYMBOL",
-          "name": "_rebase_summary"
+          "type": "ALIAS",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_rebase_summary"
+          },
+          "named": true,
+          "value": "summary"
         },
         {
           "type": "SYMBOL",
@@ -284,7 +289,7 @@
                 "name": "_rebase_header"
               },
               "named": true,
-              "value": "summary"
+              "value": "header"
             },
             {
               "type": "PATTERN",
@@ -326,7 +331,7 @@
                 "name": "_rebase_header"
               },
               "named": true,
-              "value": "summary"
+              "value": "header"
             },
             {
               "type": "PATTERN",

diff --git a/src/node-types.json b/src/node-types.json
@@ -42,7 +42,7 @@
     "named": true,
     "fields": {},
     "children": {
-      "multiple": true,
+      "multiple": false,
       "required": false,
       "types": [
         {
@@ -53,10 +53,6 @@
           "type": "commit",
           "named": true
         },
-        {
-          "type": "rebase_command",
-          "named": true
-        },
         {
           "type": "scissors",
           "named": true
@@ -136,19 +132,31 @@
     "fields": {},
     "children": {
       "multiple": true,
-      "required": false,
+      "required": true,
       "types": [
+        {
+          "type": "branch",
+          "named": true
+        },
         {
           "type": "change",
           "named": true
         },
+        {
+          "type": "commit",
+          "named": true
+        },
         {
           "type": "header",
           "named": true
         },
         {
           "type": "path",
           "named": true
+        },
+        {
+          "type": "rebase_command",
+          "named": true
         }
       ]
     }

diff --git a/src/parser.c b/src/parser.c
@@ -221,8 +221,8 @@ static const char * const ts_symbol_names[] = {
   [sym_message] = "message",
   [sym_comment] = "comment",
   [sym__comment_body] = "_comment_body",
-  [sym__rebase_summary] = "_rebase_summary",
-  [sym__rebase_header] = "summary",
+  [sym__rebase_summary] = "summary",
+  [sym__rebase_header] = "header",
   [sym_summary] = "summary",
   [sym__change_header] = "header",
   [sym__branch_declaration] = "_branch_declaration",
@@ -330,8 +330,8 @@ static const TSSymbol ts_symbol_map[] = {
   [sym_message] = sym_message,
   [sym_comment] = sym_comment,
   [sym__comment_body] = sym__comment_body,
-  [sym__rebase_summary] = sym__rebase_summary,
-  [sym__rebase_header] = sym_summary,
+  [sym__rebase_summary] = sym_summary,
+  [sym__rebase_header] = sym_header,
   [sym_summary] = sym_summary,
   [sym__change_header] = sym_header,
   [sym__branch_declaration] = sym__branch_declaration,
@@ -704,7 +704,7 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .named = true,
   },
   [sym__rebase_summary] = {
-    .visible = false,
+    .visible = true,
     .named = true,
   },
   [sym__rebase_header] = {

diff --git a/test/corpus/comments.txt b/test/corpus/comments.txt
@@ -246,14 +246,15 @@ Update onedark theme to use new scopes (#1297)
 (source
   (subject)
   (comment
-    (commit)
-    (summary)
-    (rebase_command)
-    (rebase_command)
-    (summary)
-    (rebase_command)
-    (branch)
-    (commit))
+    (summary
+      (commit)
+      (header)
+      (rebase_command)
+      (rebase_command)
+      (header)
+      (rebase_command)
+      (branch)
+      (commit)))
   (comment
     (summary
       (header)
@@ -278,13 +279,14 @@ Rebase with multiple commands done, zero commands to go
 
 (source
   (comment
-    (commit)
-    (summary)
-    (rebase_command)
-    (rebase_command)
-    (summary)
-    (branch)
-    (commit))
+    (summary
+      (commit)
+      (header)
+      (rebase_command)
+      (rebase_command)
+      (header)
+      (branch)
+      (commit)))
   (comment
     (summary
       (header)

diff --git a/test/corpus/message.txt b/test/corpus/message.txt
@@ -151,14 +151,15 @@ add submodule on tree-sitter-rebase, add to languages
   (comment)
   (comment)
   (comment
-    (commit)
-    (summary)
-    (rebase_command)
-    (summary)
-    (rebase_command)
-    (rebase_command)
-    (branch)
-    (commit))
+    (summary
+      (commit)
+      (header)
+      (rebase_command)
+      (header)
+      (rebase_command)
+      (rebase_command)
+      (branch)
+      (commit)))
   (comment
     (summary
       (header)

diff --git a/tree-sitter-git_commit.wasm b/tree-sitter-git_commit.wasm