@willbooster/tree-sitter-kotlin 1.3.1 → 1.3.2

package/grammar.js

@@ -45,6 +45,7 @@ module.exports = grammar({
     [$._loop_prefix, $.annotated_expression],
     [$._loop_prefix, $.modifiers, $.type_modifiers, $.annotated_expression],
     [$._loop_prefix, $.labeled_expression],
+    [$._loop_prefix, $.type_modifiers, $.annotated_expression],
     [$.parameter_modifiers, $.type_modifiers],
     [$.function_modifier, $.type_modifiers],
     [$.function_modifier, $._reserved_identifier],
@@ -88,7 +89,7 @@ module.exports = grammar({
     '$',
   ],
 
-  inline: ($) => [$._statements, $._identifier],
+  inline: ($) => [$._statements, $._identifier, $._control_structure_body],
 
   precedences: ($) => [
     [$.block, $.lambda_literal],
@@ -298,7 +299,7 @@ module.exports = grammar({
           'in',
           $.expression,
           ')',
-          optional(field('body', choice($.block, $.statement)))
+          optional(field('body', $._control_structure_body))
         )
       ),
 
@@ -310,7 +311,7 @@ module.exports = grammar({
           '(',
           field('condition', $.expression),
           ')',
-          optional(choice(field('body', choice($.block, $.statement)), ';'))
+          optional(choice(field('body', $._control_structure_body), ';'))
         )
       ),
 
@@ -319,7 +320,7 @@ module.exports = grammar({
         seq(
           optional($._loop_prefix),
           'do',
-          optional(choice(field('body', choice($.block, $.statement)), ';')),
+          optional(choice(field('body', $._control_structure_body), ';')),
           'while',
           '(',
           field('condition', $.expression),
@@ -598,18 +599,23 @@ module.exports = grammar({
           field('condition', $.expression),
           ')',
           choice(
-            field('consequence', choice($.block, $.expression, $.assignment)),
+            field('consequence', $._control_structure_body),
             ';',
             seq(
-              optional(field('consequence', choice($.block, $.expression, $.assignment))),
+              optional(field('consequence', $._control_structure_body)),
               optional(';'),
               'else',
-              choice(field('alternative', choice($.block, $.expression, $.assignment)), ';')
+              choice(field('alternative', $._control_structure_body), ';')
             )
           )
         )
       ),
 
+    // Unlike Kotlin's grammar, this excludes declarations, which the compiler rejects here anyway: allowing them
+    // lets declarations nest in every expression context and exceeds tree-sitter's limit of 65535 parse states.
+    _control_structure_body: ($) =>
+      choice($.block, $.expression, $.assignment, $.for_statement, $.while_statement, $.do_while_statement),
+
     parenthesized_expression: ($) => seq('(', $.expression, ')'),
 
     collection_literal: ($) => seq('[', commaSep1($.expression), optional(','), ']'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-kotlin",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Kotlin grammar for tree-sitter",
   "keywords": [
     "incremental",

package/src/node-types.json

@@ -936,12 +936,28 @@
         "multiple": false,
         "required": false,
         "types": [
+          {
+            "type": "assignment",
+            "named": true
+          },
           {
             "type": "block",
             "named": true
           },
           {
-            "type": "statement",
+            "type": "do_while_statement",
+            "named": true
+          },
+          {
+            "type": "expression",
+            "named": true
+          },
+          {
+            "type": "for_statement",
+            "named": true
+          },
+          {
+            "type": "while_statement",
             "named": true
           }
         ]
@@ -1079,12 +1095,28 @@
         "multiple": false,
         "required": false,
         "types": [
+          {
+            "type": "assignment",
+            "named": true
+          },
           {
             "type": "block",
             "named": true
           },
           {
-            "type": "statement",
+            "type": "do_while_statement",
+            "named": true
+          },
+          {
+            "type": "expression",
+            "named": true
+          },
+          {
+            "type": "for_statement",
+            "named": true
+          },
+          {
+            "type": "while_statement",
             "named": true
           }
         ]
@@ -1295,9 +1327,21 @@
             "type": "block",
             "named": true
           },
+          {
+            "type": "do_while_statement",
+            "named": true
+          },
           {
             "type": "expression",
             "named": true
+          },
+          {
+            "type": "for_statement",
+            "named": true
+          },
+          {
+            "type": "while_statement",
+            "named": true
           }
         ]
       },
@@ -1323,9 +1367,21 @@
             "type": "block",
             "named": true
           },
+          {
+            "type": "do_while_statement",
+            "named": true
+          },
           {
             "type": "expression",
             "named": true
+          },
+          {
+            "type": "for_statement",
+            "named": true
+          },
+          {
+            "type": "while_statement",
+            "named": true
           }
         ]
       }
@@ -2605,12 +2661,28 @@
         "multiple": false,
         "required": false,
         "types": [
+          {
+            "type": "assignment",
+            "named": true
+          },
           {
             "type": "block",
             "named": true
           },
           {
-            "type": "statement",
+            "type": "do_while_statement",
+            "named": true
+          },
+          {
+            "type": "expression",
+            "named": true
+          },
+          {
+            "type": "for_statement",
+            "named": true
+          },
+          {
+            "type": "while_statement",
             "named": true
           }
         ]

package/tree-sitter.json

@@ -13,7 +13,7 @@
     }
   ],
   "metadata": {
-    "version": "1.3.1",
+    "version": "1.3.2",
     "license": "MIT",
     "description": "Kotlin grammar for tree-sitter",
     "authors": [