@willbooster/tree-sitter-kotlin 1.4.2 → 1.5.1

package/grammar.js

@@ -86,6 +86,11 @@ module.exports = grammar({
     $._in,
     $._q_dot,
     $._multiline_string_content,
+    $._multi_dollar_string_start,
+    $._multi_dollar_multiline_string_start,
+    $._multi_dollar_string_content,
+    $._multi_dollar_interpolation_start,
+    $._multi_dollar_string_end,
     // used to check if a preceding annoation should not have an automatic _semi inserted
     'constructor',
     'get',
@@ -683,26 +688,51 @@ module.exports = grammar({
     object_literal: ($) => seq('object', optional(seq(':', $.delegation_specifiers)), $.class_body),
 
     string_literal: ($) =>
-      seq(
-        '"',
-        repeat(
-          choice(
-            alias(
-              choice(token.immediate(prec(2, seq('\\', /[^bnrt'"\\$]/))), token.immediate(prec(1, /[^"\\$]+/)), '$'),
-              $.string_content
-            ),
-            $.escape_sequence,
-            $.interpolation
-          )
+      choice(
+        seq(
+          '"',
+          repeat(
+            choice(
+              alias(
+                choice(token.immediate(prec(2, seq('\\', /[^bnrt'"\\$]/))), token.immediate(prec(1, /[^"\\$]+/)), '$'),
+                $.string_content
+              ),
+              $.escape_sequence,
+              $.interpolation
+            )
+          ),
+          '"'
         ),
-        '"'
+        seq(
+          $._multi_dollar_string_start,
+          repeat(
+            choice(
+              alias($._multi_dollar_string_content, $.string_content),
+              $.escape_sequence,
+              alias($._multi_dollar_interpolation, $.interpolation)
+            )
+          ),
+          $._multi_dollar_string_end
+        )
       ),
 
     multiline_string_literal: ($) =>
-      seq(
-        '"""',
-        repeat(choice(alias($._multiline_string_content, $.string_content), $.interpolation)),
-        choice('"""', '""""')
+      choice(
+        seq(
+          '"""',
+          repeat(choice(alias($._multiline_string_content, $.string_content), $.interpolation)),
+          choice('"""', '""""')
+        ),
+        seq(
+          $._multi_dollar_multiline_string_start,
+          repeat(
+            choice(
+              alias($._multi_dollar_string_content, $.string_content),
+              alias($._multi_dollar_interpolation, $.interpolation)
+            )
+          ),
+          $._multi_dollar_string_end
+        )
       ),
 
     interpolation: ($) =>
@@ -712,6 +742,17 @@ module.exports = grammar({
         seq('${', $.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, '}')
+        )
+      ),
+
     character_literal: ($) => seq("'", choice(token.immediate(prec(1, /[^'\\\r\n]/)), $.escape_sequence), "'"),
 
     escape_sequence: () => token.immediate(prec(1, seq('\\', choice(/[^xu0-7]/, /u[0-9a-fA-F]{4}/)))),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-kotlin",
-  "version": "1.4.2",
+  "version": "1.5.1",
   "description": "Kotlin grammar for tree-sitter",
   "keywords": [
     "incremental",
@@ -22,13 +22,13 @@
   ],
   "scripts": {
     "build-wasm": "tree-sitter build --wasm",
-    "build/ci": "tree-sitter generate && tree-sitter build --wasm",
+    "build/ci": "tree-sitter generate && script/generate-letter-ranges && tree-sitter build --wasm",
     "cleanup": "bun wb lint --fix --format",
     "format": "bun wb lint --format",
     "lint": "bun wb lint",
     "lint-fix": "bun wb lint --fix",
     "prepare": "(bun lefthook install || true) && (test ! -f .lefthook/normalize-bun-lockfile.sh || bash .lefthook/normalize-bun-lockfile.sh)",
-    "release": "wb release",
+    "release": "node script/release.mjs",
     "prestart": "bun run build-wasm",
     "start": "tree-sitter playground",
     "test": "bun wb test",
@@ -46,7 +46,7 @@
     "@willbooster/oxfmt-config": "1.2.2",
     "@willbooster/oxlint-config": "1.4.8",
     "@willbooster/wb": "22.11.5",
-    "@willbooster/web-tree-sitter": "1.0.0",
+    "@willbooster/web-tree-sitter": "1.0.7",
     "conventional-changelog-conventionalcommits": "10.4.0",
     "lefthook": "2.1.14",
     "oxfmt": "0.70.0",

package/tree-sitter.json

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