@willbooster/tree-sitter-kotlin 1.6.4 → 1.6.5

package/grammar.js

@@ -121,6 +121,10 @@ module.exports = grammar({
     $._top_level_statement_end,
     // empty: it ends a context list of types among modifiers, except directly in a statement list (see `modifiers`)
     $._context_end,
+    // a hard keyword other than `this` right after the `$` of a string template (see `_template_name`)
+    $._keyword_reference,
+    // never scanned: see `_template_name`
+    $._keyword_reference_end,
   ],
 
   inline: ($) => [$._statements, $._identifier, $._control_structure_body],
@@ -861,7 +865,11 @@ module.exports = grammar({
     _template_name: ($) =>
       choice(
         alias(token.immediate(prec(2, /[\p{L}_][\p{L}_\p{Nd}]*/u)), $.identifier),
-        alias(token.immediate(prec(2, 'this')), $.this_expression)
+        alias(token.immediate(prec(2, 'this')), $.this_expression),
+        // As in Kotlin, another hard keyword after `$` is an error: the scanner lexes it, and the grammar then expects
+        // `_keyword_reference_end`, which is never scanned. The first alias keeps a name required in `interpolation`; the
+        // second makes the end visible when error recovery inserts it as missing, which a hidden token would not be.
+        seq(alias($._keyword_reference, $.identifier), alias($._keyword_reference_end, 'keyword_reference_end'))
       ),
 
     // In a string prefixed with n dollars (Kotlin 2.1), exactly n dollars start an interpolation; the scanner

package/package.json

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

package/src/node-types.json

@@ -3129,6 +3129,10 @@
     "type": "is",
     "named": false
   },
+  {
+    "type": "keyword_reference_end",
+    "named": false
+  },
   {
     "type": "label",
     "named": true

package/tree-sitter.json

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