Fix end line comment not being included in node text (#144)

* Fix ending line comment not being included in node text * npm run build * Rework solution, add more tests * npm run build * Lift out $.line_comment from $._single_type_expression * npm run build
elm-tooling · Dec 18, 2023 · 44ffae4 · 44ffae4
1 parent ac2b629
commit 44ffae4
Show file tree

Hide file tree

Showing 5 changed files with 17,165 additions and 16,574 deletions.
diff --git a/grammar.js b/grammar.js
@@ -241,7 +241,7 @@ module.exports = grammar({
       prec.left(
         seq(
           field("name", $.upper_case_identifier),
-          repeat($._single_type_expression)
+          repeat(choice($.line_comment, $._single_type_expression))
         )
       ),
 

diff --git a/src/grammar.json b/src/grammar.json
@@ -744,8 +744,17 @@
           {
             "type": "REPEAT",
             "content": {
-              "type": "SYMBOL",
-              "name": "_single_type_expression"
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "line_comment"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "_single_type_expression"
+                }
+              ]
             }
           }
         ]

diff --git a/src/node-types.json b/src/node-types.json
@@ -2602,6 +2602,16 @@
           }
         ]
       }
+    },
+    "children": {
+      "multiple": true,
+      "required": false,
+      "types": [
+        {
+          "type": "line_comment",
+          "named": true
+        }
+      ]
     }
   },
   {