@willbooster/tree-sitter-kotlin 1.5.1 → 1.5.3

package/grammar.js

@@ -16,6 +16,7 @@ const PREC = {
   AS: 12,
   CALL: 13,
   UNARY: 14,
+  DELEGATION: 15,
 };
 
 // oxlint-disable-next-line unicorn/prefer-module -- This package is CommonJS, so tree-sitter loads grammar.js as CommonJS.
@@ -67,7 +68,6 @@ module.exports = grammar({
     [$.visibility_modifier, $._reserved_identifier],
     [$.member_modifier, $._reserved_identifier],
 
-    [$.explicit_delegation, $.expression],
     [$.qualified_identifier],
     [$.constructor_invocation, $._unescaped_annotation],
     [$.nullable_type],
@@ -271,7 +271,9 @@ module.exports = grammar({
 
     property_delegate: ($) => seq('by', $.expression),
 
-    explicit_delegation: ($) => seq($.type, 'by', $.primary_expression),
+    // Above PREC.CALL so that, as in Kotlin, a `{` after the delegation expression starts the class body instead of a
+    // trailing lambda. The last operand of an operator expression still takes the lambda (#29).
+    explicit_delegation: ($) => prec(PREC.DELEGATION, seq($.type, 'by', $.expression)),
 
     getter: ($) =>
       prec.right(
@@ -718,11 +720,7 @@ module.exports = grammar({
 
     multiline_string_literal: ($) =>
       choice(
-        seq(
-          '"""',
-          repeat(choice(alias($._multiline_string_content, $.string_content), $.interpolation)),
-          choice('"""', '""""')
-        ),
+        seq('"""', repeat(choice(alias($._multiline_string_content, $.string_content), $.interpolation)), '"""'),
         seq(
           $._multi_dollar_multiline_string_start,
           repeat(

package/package.json

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

package/src/node-types.json

@@ -1043,7 +1043,7 @@
       "required": true,
       "types": [
         {
-          "type": "primary_expression",
+          "type": "expression",
           "named": true
         },
         {
@@ -2745,10 +2745,6 @@
     "type": "\"\"\"",
     "named": false
   },
-  {
-    "type": "\"\"\"\"",
-    "named": false
-  },
   {
     "type": "$",
     "named": false

package/tree-sitter.json

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