@willbooster/tree-sitter-kotlin 1.7.4 → 2.0.0

package/grammar.js

@@ -134,6 +134,9 @@ module.exports = grammar({
     'where',
     $._separated_member_start,
     $._unseparated_member_start,
+    $._infix_position,
+    $._companion_name_position,
+    $._try_continuation_position,
   ],
 
   inline: ($) => [$._statements, $._identifier, $._control_structure_body],
@@ -271,7 +274,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)
       ),
@@ -705,7 +708,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)`.
@@ -817,11 +821,19 @@ module.exports = grammar({
     type_test: ($) => seq(choice('is', alias($._not_is, '!is')), $.type),
 
     try_expression: ($) =>
-      seq('try', $.block, choice(seq(repeat1($.catch_block), optional($.finally_block)), $.finally_block)),
+      seq(
+        'try',
+        $.block,
+        choice(
+          seq(repeat1(seq($.catch_block, optional($._try_continuation_position))), optional($.finally_block)),
+          $.finally_block
+        )
+      ),
 
     catch_block: ($) => seq('catch', '(', repeat($.annotation), $.identifier, ':', $.type, optional(','), ')', $.block),
 
-    finally_block: ($) => seq('finally', $.block),
+    finally_block: ($) =>
+      choice(prec(1, seq($._try_continuation_position, 'finally', $.block)), seq('finally', $.block)),
 
     return_expression: ($) =>
       prec.right(seq(choice('return', seq('return@', field('label', $.identifier))), optional($.expression))),

package/package.json

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

package/tree-sitter.json

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