@willbooster/tree-sitter-kotlin 1.7.3 → 1.7.5

package/grammar.js

@@ -61,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],
@@ -88,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.
@@ -133,6 +134,8 @@ module.exports = grammar({
     'where',
     $._separated_member_start,
     $._unseparated_member_start,
+    $._infix_position,
+    $._companion_name_position,
   ],
 
   inline: ($) => [$._statements, $._identifier, $._control_structure_body],
@@ -270,7 +273,7 @@ module.exports = grammar({
         'companion',
         'object',
         optional($._unseparated_member_start),
-        optional(field('name', $.identifier)),
+        optional(seq(optional($._companion_name_position), field('name', $.identifier))),
         optional(seq(':', $.delegation_specifiers)),
         optional($.class_body)
       ),
@@ -346,7 +349,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),
 
@@ -702,7 +707,8 @@ module.exports = grammar({
 
     range_expression: ($) => prec.left(PREC.RANGE, seq($.expression, choice('..', '..<'), $.expression)),
 
-    infix_expression: ($) => prec.left(PREC.INFIX, seq($.expression, $.identifier, $.expression)),
+    infix_expression: ($) =>
+      prec.left(PREC.INFIX, seq($.expression, optional($._infix_position), $.identifier, $.expression)),
 
     // Right-associative so that a trailing lambda after arguments belongs to the same call (`f(x) { … }`), as in
     // Kotlin, instead of calling the result of `f(x)`.
@@ -730,7 +736,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.3",
+  "version": "1.7.5",
   "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.3",
+    "version": "1.7.5",
     "license": "MIT",
     "description": "Kotlin grammar for tree-sitter",
     "authors": [