@willbooster/tree-sitter-kotlin 1.5.7 → 1.5.9

package/grammar.js

@@ -82,6 +82,8 @@ module.exports = grammar({
     $._semi,
     $._class_member_semi,
     $.block_comment,
+    // also lexed by the scanner, since the generated lexer stops at a NUL character
+    $.line_comment,
     $._not_is,
     $._in,
     $._q_dot,
@@ -767,23 +769,21 @@ module.exports = grammar({
         )
       ),
 
-    interpolation: ($) =>
+    interpolation: ($) => choice(seq('$', $._template_name), seq('${', $.expression, '}')),
+
+    // Immediate so that it outranks the string content that would otherwise absorb the name. As in Kotlin, `$this`
+    // refers to `this`: with the same token precedence as the name pattern, the string token wins a match of equal
+    // length (without its `prec(2)`, `$this` lexes as a name again), while a longer name such as `$thisX` still wins.
+    _template_name: ($) =>
       choice(
-        // Immediate so that it outranks the string content that would otherwise absorb the name.
-        seq('$', alias(token.immediate(prec(2, /[\p{L}_][\p{L}_\p{Nd}]*/u)), $.identifier)),
-        seq('${', $.expression, '}')
+        alias(token.immediate(prec(2, /[\p{L}_][\p{L}_\p{Nd}]*/u)), $.identifier),
+        alias(token.immediate(prec(2, 'this')), $.this_expression)
       ),
 
     // In a string prefixed with n dollars (Kotlin 2.1), exactly n dollars start an interpolation; the scanner
     // returns them as one token only where they do.
     _multi_dollar_interpolation: ($) =>
-      seq(
-        $._multi_dollar_interpolation_start,
-        choice(
-          alias(token.immediate(prec(2, /[\p{L}_][\p{L}_\p{Nd}]*/u)), $.identifier),
-          seq(token.immediate('{'), $.expression, '}')
-        )
-      ),
+      seq($._multi_dollar_interpolation_start, choice($._template_name, seq(token.immediate('{'), $.expression, '}'))),
 
     character_literal: ($) => seq("'", choice(token.immediate(prec(1, /[^'\\\r\n]/)), $.escape_sequence), "'"),
 

package/package.json

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

package/src/node-types.json

@@ -1486,6 +1486,10 @@
         {
           "type": "identifier",
           "named": true
+        },
+        {
+          "type": "this_expression",
+          "named": true
         }
       ]
     }

package/tree-sitter.json

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