@willbooster/tree-sitter-kotlin 1.7.2 → 1.7.4

package/grammar.js

@@ -14,8 +14,9 @@ const PREC = {
   ADD: 10,
   MULTIPLY: 11,
   AS: 12,
-  CALL: 13,
-  UNARY: 14,
+  PREFIX: 13,
+  CALL: 14,
+  POSTFIX: 14,
 };
 
 // oxlint-disable-next-line unicorn/prefer-module -- This package is CommonJS, so tree-sitter loads grammar.js as CommonJS.
@@ -27,6 +28,7 @@ module.exports = grammar({
     [$.class_body, $.enum_class_body],
 
     [$.binary_expression, $.call_expression],
+    [$.unary_expression, $.binary_expression, $.call_expression],
     [$.binary_expression, $.in_expression, $.call_expression],
     [$.binary_expression, $.infix_expression, $.call_expression],
     [$.binary_expression, $.range_expression, $.call_expression],
@@ -59,7 +61,7 @@ module.exports = grammar({
 
     [$.function_value_parameters, $.function_type_parameters],
     [$.parenthesized_type, $.function_type_parameters],
-    [$.multi_variable_declaration, $.function_type_parameters],
+    [$._multi_variable_declaration, $.function_type_parameters],
 
     [$.class_modifier, $._reserved_identifier],
     [$.platform_modifier, $._reserved_identifier],
@@ -86,6 +88,7 @@ module.exports = grammar({
   extras: ($) => [/\s/, $.line_comment, $.block_comment],
 
   externals: ($) => [
+    $._destructuring_type_start,
     $._semi,
     $._class_member_semi,
     // Unlike properties, these declarations can end before another member on the same line.
@@ -344,7 +347,9 @@ module.exports = grammar({
 
     variable_declaration: ($) => prec(1, seq(repeat($.annotation), $._identifier, optional(seq(':', $.type)))),
 
-    multi_variable_declaration: ($) => seq('(', optionalCommaSep1($.variable_declaration), ')'),
+    multi_variable_declaration: ($) => $._multi_variable_declaration,
+
+    _multi_variable_declaration: ($) => seq('(', optionalCommaSep1($.variable_declaration), ')'),
 
     property_delegate: ($) => seq('by', $.expression),
 
@@ -637,12 +642,12 @@ module.exports = grammar({
       ),
 
     unary_expression: ($) =>
-      prec.left(
-        PREC.UNARY,
-        choice(
-          seq(field('operator', choice('++', '--', '+', '-', '!')), field('argument', $.expression)),
-          seq(field('argument', $.expression), field('operator', choice('++', '--', '!!')))
-        )
+      choice(
+        prec.right(
+          PREC.PREFIX,
+          seq(field('operator', choice('++', '--', '+', '-', '!')), field('argument', $.expression))
+        ),
+        prec.left(PREC.POSTFIX, seq(field('argument', $.expression), field('operator', choice('++', '--', '!!'))))
       ),
 
     annotated_expression: ($) => seq($.annotation, $.expression),
@@ -728,7 +733,11 @@ module.exports = grammar({
 
     lambda_parameters: ($) => seq(commaSep1($._lambda_parameter), optional(',')),
 
-    _lambda_parameter: ($) => choice($.variable_declaration, $.multi_variable_declaration),
+    _lambda_parameter: ($) =>
+      choice($.variable_declaration, alias($._destructuring_lambda_parameter, $.multi_variable_declaration)),
+
+    _destructuring_lambda_parameter: ($) =>
+      seq($._multi_variable_declaration, optional(seq(alias($._destructuring_type_start, ':'), field('type', $.type)))),
 
     anonymous_function: ($) =>
       prec.right(

package/package.json

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

package/src/node-types.json

@@ -1667,7 +1667,18 @@
   {
     "type": "multi_variable_declaration",
     "named": true,
-    "fields": {},
+    "fields": {
+      "type": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "type",
+            "named": true
+          }
+        ]
+      }
+    },
     "children": {
       "multiple": true,
       "required": false,

package/tree-sitter.json

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