fix: parse multiline trailer value (#49)

Ref: #47
gbprod · Jan 18, 2024 · e8d9eda · e8d9eda
1 parent 7e3ad5f
commit e8d9eda
Show file tree

Hide file tree

Showing 4 changed files with 16,036 additions and 15,994 deletions.
diff --git a/corpus/body.txt b/corpus/body.txt
@@ -127,6 +127,23 @@ Suggested-by: Toto
       (token)
       (value))))
 
+================================================================================
+Multiline trailers
+================================================================================
+This is a simple subject
+
+key: This is a very long value, with spaces and
+  newlines in it.
+
+--------------------------------------------------------------------------------
+
+(source
+  (subject)
+  (message
+    (trailer
+      (token)
+      (value))))
+
 ================================================================================
 Mixed
 ================================================================================

diff --git a/grammar.js b/grammar.js
@@ -11,6 +11,7 @@ const SCOPE = /[a-zA-Z0-9_-]+/;
 const COMMENT = /[^\n\r]*\r?\n/;
 const COMMENT_TITLE = /[^\n\r:\uff1a]+[:\uff1a]\s*\r?\n/;
 const TRAILER_TOKEN = /[a-zA-Z-]+[ ]*[:\uff1a] /;
+const TRAILER_VALUE = /[^\n\r]+(\r?\n [^\n\r]+)*/;
 const GENERATED_COMMENT_TITLE = /[^\n\r:\uff1a]+[:\uff1a][ ]*/;
 const NUMBER = /\d+/;
 const BREAKING_CHANGE = /BREAKING[- ]CHANGE/;
@@ -57,7 +58,7 @@ module.exports = grammar({
     _message: () => seq(NOT_A_COMMENT, optional(ANYTHING)),
 
     trailer: ($) =>
-      seq(alias(TRAILER_TOKEN, $.token), alias(ANYTHING, $.value)),
+      seq(alias(TRAILER_TOKEN, $.token), alias(TRAILER_VALUE, $.value)),
 
     breaking_change: ($) =>
       seq(

diff --git a/src/grammar.json b/src/grammar.json
@@ -309,7 +309,7 @@
           "type": "ALIAS",
           "content": {
             "type": "PATTERN",
-            "value": "[^\\n\\r]+"
+            "value": "[^\\n\\r]+(\\r?\\n [^\\n\\r]+)*"
           },
           "named": true,
           "value": "value"