@dekobon/tree-sitter-groovy 0.2.1 → 0.3.0

package/grammar.js

@@ -91,10 +91,12 @@ module.exports = grammar({
   // Tokens the spec §6 proposes as external scanner branches but
   // that this grammar implements in-grammar (GString interpolation
   // via regex tokens, slashy body via in-grammar `_slashy_text`,
-  // statement boundaries via `repeat($._statement)`, label colon
-  // via grammar precedence) are intentionally NOT listed — listing
-  // an unwired external token would let dormant scanner branches
-  // mis-fire in error-recovery states.
+  // label colon via grammar precedence, and statement boundaries
+  // via `repeat(choice($._statement, ';'))` — newline is `extras`
+  // whitespace and `;` is an anonymous list element, see §5.10)
+  // are intentionally NOT listed: listing an unwired external token
+  // would let dormant scanner branches mis-fire in error-recovery
+  // states.
   externals: $ => [
     $._slashy_string_start,
     $.line_comment,
@@ -150,7 +152,7 @@ module.exports = grammar({
     // SPECIFICATION.md §4 (statement and declaration coverage).
     source_file: $ => seq(
       optional($.shebang),
-      repeat($._statement),
+      repeat(choice($._statement, ';')),
     ),
 
     // §4 — `#!/usr/bin/env groovy` line at file start. Single
@@ -237,19 +239,26 @@ module.exports = grammar({
     // are valid alternatives (e.g. the body slot of `if` / `while`).
     block: $ => prec(1, seq(
       '{',
-      repeat($._statement),
+      repeat(choice($._statement, ';')),
       '}',
     )),
 
     // §4 — if / else. `prec.right` resolves the dangling-else
     // ambiguity in favour of the closest `if`. Body accepts either
-    // an explicit block (preferred) or a single statement.
+    // an explicit block (preferred) or a single statement. The
+    // `optional(';')` after the consequence keeps the else attached
+    // when a braceless consequence is terminated by a semicolon
+    // (`if (x) a(); else b()`); without it the `;` is claimed by the
+    // enclosing statement list (§5.10) and the `else` is severed. It
+    // sits outside the else clause so the no-else form (`if (x) a();
+    // b()`) does not require an `else` after eating the `;`.
     if_statement: $ => prec.right(seq(
       'if',
       '(',
       field('condition', $._expression),
       ')',
       field('consequence', choice($.block, $._statement)),
+      optional(';'),
       optional(seq(
         'else',
         field('alternative', choice($.block, $._statement)),
@@ -266,13 +275,17 @@ module.exports = grammar({
     ),
 
     // §4 — C-style for. init / condition / update slots all
-    // optional; bare `for (;;)` is the infinite-loop idiom.
-    // Typed variable declarations in init (`int i = 0`) land with
-    // local_variable_declaration in a later iteration.
+    // optional; bare `for (;;)` is the infinite-loop idiom. The init
+    // slot accepts a single expression (`i = 0`) or a variable
+    // declaration (`int i = 0`, `def i = 0`, incl. multiple
+    // declarators). Apache `GroovyParser.g4` `forInit:
+    // localVariableDeclaration | expressionList` also allows a
+    // comma-separated expression list (`i = 0, j = 1`); that form is
+    // not yet supported.
     for_statement: $ => seq(
       'for',
       '(',
-      optional(field('init', $._expression)),
+      optional(field('init', choice($._expression, $.local_variable_declaration))),
       ';',
       optional(field('condition', $._expression)),
       ';',
@@ -282,9 +295,13 @@ module.exports = grammar({
     ),
 
     // §4 — do-while. Body is required; condition follows the body.
+    // `optional(';')` lets a braceless body be terminated before
+    // `while` (`do a(); while (c)`, the Java/Groovy `do S while (e);`
+    // form); without it the `;` errors since `while` is required next.
     do_while_statement: $ => seq(
       'do',
       field('body', choice($.block, $._statement)),
+      optional(';'),
       'while',
       '(',
       field('condition', $._expression),
@@ -510,9 +527,13 @@ module.exports = grammar({
 
     // §4 — `{ method* }` for v1. Field declarations, static
     // initialisers, and inner classes land later.
+    // The body accepts `;` as an empty member / terminator the same
+    // way statement lists do (§5.10): a field or abstract method is
+    // commonly written `int x = 1;` / `void f();`, and a stray `;` is
+    // a no-op member. `;` is anonymous, so it never appears in the AST.
     class_body: $ => seq(
       '{',
-      repeat($._class_member),
+      repeat(choice($._class_member, ';')),
       '}',
     ),
 
@@ -635,7 +656,7 @@ module.exports = grammar({
         repeat(seq(',', $.enum_constant)),
         optional(','),
       )),
-      optional(seq(';', repeat($._class_member))),
+      optional(seq(';', repeat(choice($._class_member, ';')))),
       '}',
     ),
 
@@ -847,21 +868,26 @@ module.exports = grammar({
       'case',
       field('value', $._expression),
       ':',
-      repeat($._statement),
+      repeat(choice($._statement, ';')),
     ),
 
+    // The arrow body may be terminated by `;` (`case 1 -> foo();`),
+    // matching the Java/Groovy `case L -> expr;` arrow form. The `;`
+    // is anonymous and absorbed here rather than by the switch block,
+    // which has no statement-list of its own.
     switch_arrow_case: $ => seq(
       'case',
       field('value', $._expression),
       '->',
       field('body', choice($.block, $._statement)),
+      optional(';'),
     ),
 
     switch_default: $ => seq(
       'default',
       choice(
-        seq(':', repeat($._statement)),
-        seq('->', field('body', choice($.block, $._statement))),
+        seq(':', repeat(choice($._statement, ';'))),
+        seq('->', field('body', choice($.block, $._statement)), optional(';')),
       ),
     ),
 
@@ -1351,7 +1377,7 @@ module.exports = grammar({
     closure: $ => seq(
       '{',
       optional($.closure_parameters),
-      repeat($._statement),
+      repeat(choice($._statement, ';')),
       '}',
     ),
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dekobon/tree-sitter-groovy",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "Apache Groovy grammar for tree-sitter (dekobon fork)",
   "main": "bindings/node",
   "types": "bindings/node",
@@ -70,7 +70,7 @@
     "eslint": "^9.39.4",
     "eslint-config-treesitter": "^1.0.2",
     "prebuildify": "^6.0.1",
-    "tree-sitter-cli": "^0.26.9"
+    "tree-sitter-cli": "^0.26.13"
   },
   "tree-sitter": [
     {

package/src/grammar.json

@@ -21,8 +21,17 @@
         {
           "type": "REPEAT",
           "content": {
-            "type": "SYMBOL",
-            "name": "_statement"
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "_statement"
+              },
+              {
+                "type": "STRING",
+                "value": ";"
+              }
+            ]
           }
         }
       ]
@@ -268,8 +277,17 @@
           {
             "type": "REPEAT",
             "content": {
-              "type": "SYMBOL",
-              "name": "_statement"
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "_statement"
+                },
+                {
+                  "type": "STRING",
+                  "value": ";"
+                }
+              ]
             }
           },
           {
@@ -322,6 +340,18 @@
               ]
             }
           },
+          {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "STRING",
+                "value": ";"
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          },
           {
             "type": "CHOICE",
             "members": [
@@ -419,8 +449,17 @@
               "type": "FIELD",
               "name": "init",
               "content": {
-                "type": "SYMBOL",
-                "name": "_expression"
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "_expression"
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "local_variable_declaration"
+                  }
+                ]
               }
             },
             {
@@ -515,6 +554,18 @@
             ]
           }
         },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "STRING",
+              "value": ";"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
         {
           "type": "STRING",
           "value": "while"
@@ -1542,8 +1593,17 @@
         {
           "type": "REPEAT",
           "content": {
-            "type": "SYMBOL",
-            "name": "_class_member"
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "_class_member"
+              },
+              {
+                "type": "STRING",
+                "value": ";"
+              }
+            ]
           }
         },
         {
@@ -2090,8 +2150,17 @@
                 {
                   "type": "REPEAT",
                   "content": {
-                    "type": "SYMBOL",
-                    "name": "_class_member"
+                    "type": "CHOICE",
+                    "members": [
+                      {
+                        "type": "SYMBOL",
+                        "name": "_class_member"
+                      },
+                      {
+                        "type": "STRING",
+                        "value": ";"
+                      }
+                    ]
                   }
                 }
               ]
@@ -2915,8 +2984,17 @@
         {
           "type": "REPEAT",
           "content": {
-            "type": "SYMBOL",
-            "name": "_statement"
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "_statement"
+              },
+              {
+                "type": "STRING",
+                "value": ";"
+              }
+            ]
           }
         }
       ]
@@ -2956,6 +3034,18 @@
               }
             ]
           }
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "STRING",
+              "value": ";"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
         }
       ]
     },
@@ -2979,8 +3069,17 @@
                 {
                   "type": "REPEAT",
                   "content": {
-                    "type": "SYMBOL",
-                    "name": "_statement"
+                    "type": "CHOICE",
+                    "members": [
+                      {
+                        "type": "SYMBOL",
+                        "name": "_statement"
+                      },
+                      {
+                        "type": "STRING",
+                        "value": ";"
+                      }
+                    ]
                   }
                 }
               ]
@@ -3008,6 +3107,18 @@
                       }
                     ]
                   }
+                },
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "STRING",
+                      "value": ";"
+                    },
+                    {
+                      "type": "BLANK"
+                    }
+                  ]
                 }
               ]
             }
@@ -5606,8 +5717,17 @@
         {
           "type": "REPEAT",
           "content": {
-            "type": "SYMBOL",
-            "name": "_statement"
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "_statement"
+              },
+              {
+                "type": "STRING",
+                "value": ";"
+              }
+            ]
           }
         },
         {

package/src/node-types.json

@@ -4121,6 +4121,10 @@
             "type": "list_literal",
             "named": true
           },
+          {
+            "type": "local_variable_declaration",
+            "named": true
+          },
           {
             "type": "logical_implication_expression",
             "named": true