feat: allow fixup and amend in subject

Ref: #34
gbprod · Dec 7, 2023 · b84b3dc · b84b3dc
1 parent 6856a5f
commit b84b3dc
Show file tree

Hide file tree

Showing 8 changed files with 32,265 additions and 31,891 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: '18.x'
+          node-version: '20.10.x'
           registry-url: 'https://registry.npmjs.org'
       - name: Install dependencies
         run: npm ci

diff --git a/corpus/subject.txt b/corpus/subject.txt
@@ -92,8 +92,8 @@ This should not exists
 --------------------------------------------------------------------------------
 
 (source
-  (subject)
-  (ERROR))
+    (subject)
+    (ERROR))
 
 ================================================================================
 Subject with type and scope
@@ -157,3 +157,56 @@ feat(issue42): allow numbers in scope
 
 (source
   (subject))
+
+================================================================================
+Parse fixup!
+================================================================================
+fixup! allow fixup
+
+--------------------------------------------------------------------------------
+
+(source
+  (subject
+    (subject_prefix)))
+
+================================================================================
+Parse amend! with conventional commit
+================================================================================
+amend! feat(test): allow fixup
+
+--------------------------------------------------------------------------------
+
+(source
+  (subject
+    (subject_prefix)
+    (prefix
+      (type)
+      (scope))))
+
+================================================================================
+Parse amend! with conventional commit and overflow
+================================================================================
+amend! feat(test): allow fixup with an overflow on the subject
+
+--------------------------------------------------------------------------------
+
+(source
+  (subject
+    (subject_prefix)
+    (prefix
+      (type)
+      (scope))
+    (overflow)))
+
+================================================================================
+Parse fixup! with conventional commit and no scope
+================================================================================
+amend! feat: allow fixup
+
+--------------------------------------------------------------------------------
+
+(source
+  (subject
+    (subject_prefix)
+    (prefix
+      (type))))
diff --git a/grammar.js b/grammar.js
@@ -33,6 +33,9 @@ module.exports = grammar({
 
     subject: ($) =>
       seq(
+        optional(
+          seq(alias(choice('fixup!', 'amend!'), $.subject_prefix), WHITESPACE)
+        ),
         choice(
           seq(NOT_A_COMMENT, SUBJECT),
           seq($.prefix, $._conventional_subject)

diff --git a/package-lock.json b/package-lock.json
diff --git a/queries/highlights.scm b/queries/highlights.scm
@@ -29,5 +29,6 @@
 (breaking_change (value) @text)
 
 (scissor) @comment
+(subject_prefix) @keyword
 
 (ERROR) @error
diff --git a/src/grammar.json b/src/grammar.json
@@ -102,6 +102,41 @@
     "subject": {
       "type": "SEQ",
       "members": [
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "ALIAS",
+                  "content": {
+                    "type": "CHOICE",
+                    "members": [
+                      {
+                        "type": "STRING",
+                        "value": "fixup!"
+                      },
+                      {
+                        "type": "STRING",
+                        "value": "amend!"
+                      }
+                    ]
+                  },
+                  "named": true,
+                  "value": "subject_prefix"
+                },
+                {
+                  "type": "PATTERN",
+                  "value": "[\\f\\v ]+"
+                }
+              ]
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
         {
           "type": "CHOICE",
           "members": [

diff --git a/src/node-types.json b/src/node-types.json
@@ -249,6 +249,10 @@
         {
           "type": "prefix",
           "named": true
+        },
+        {
+          "type": "subject_prefix",
+          "named": true
         }
       ]
     }
@@ -1060,6 +1064,10 @@
     "type": "squash",
     "named": false
   },
+  {
+    "type": "subject_prefix",
+    "named": true
+  },
   {
     "type": "supprimé :",
     "named": false