Merge pull request #20 from vrischmann/empty-script

Fix empty script block parsing
vrischmann · Jan 1, 2024 · f5c56b4 · f5c56b4
2 parents 14d1057 + aef2c35
commit f5c56b4
Show file tree

Hide file tree

Showing 5 changed files with 26,101 additions and 26,044 deletions.
diff --git a/corpus/script.txt b/corpus/script.txt
@@ -55,3 +55,21 @@ templ Foobar() {
           value: (quoted_attribute_value
             (attribute_value)))
         (script_element_text)))))
+
+===
+Empty script
+===
+
+package main
+
+script noScript() {}
+
+---
+
+(source_file
+  (package_clause
+    (package_identifier))
+  (script_declaration
+    (script_identifier)
+    (parameter_list)
+    (script_block)))
diff --git a/grammar.js b/grammar.js
@@ -331,7 +331,7 @@ module.exports = grammar(GO, {
         ),
         script_block: $ => seq(
             '{',
-            $.script_block_text,
+            optional($.script_block_text),
             '}',
         ),
 

diff --git a/src/grammar.json b/src/grammar.json
@@ -7939,8 +7939,16 @@
           "value": "{"
         },
         {
-          "type": "SYMBOL",
-          "name": "script_block_text"
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "script_block_text"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
         },
         {
           "type": "STRING",

diff --git a/src/node-types.json b/src/node-types.json
@@ -2616,7 +2616,7 @@
     "fields": {},
     "children": {
       "multiple": false,
-      "required": true,
+      "required": false,
       "types": [
         {
           "type": "script_block_text",
-Original file line number
+Diff line change
@@ Expand Up / @@ -331,7 +331,7 @@ module.exports = grammar(GO, { @@
             ),
             script_block: $ => seq(
                 '{',
-                $.script_block_text,
+                optional($.script_block_text),
                 '}',
             ),
@@ Expand Down @@