@willbooster/tree-sitter-kotlin 1.7.1 → 1.7.3

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],
@@ -88,6 +90,8 @@ module.exports = grammar({
   externals: ($) => [
     $._semi,
     $._class_member_semi,
+    // Unlike properties, these declarations can end before another member on the same line.
+    $._same_line_member_end,
     $.block_comment,
     // also lexed by the scanner, since the generated lexer stops at a NUL character
     $.line_comment,
@@ -127,6 +131,8 @@ module.exports = grammar({
     // never scanned: see `_template_name`
     $._keyword_reference_end,
     'where',
+    $._separated_member_start,
+    $._unseparated_member_start,
   ],
 
   inline: ($) => [$._statements, $._identifier, $._control_structure_body],
@@ -206,7 +212,8 @@ module.exports = grammar({
       prec.right(
         seq(
           optional($.modifiers),
-          choice('class', seq(optional('fun'), 'interface')),
+          choice('class', seq(optional(seq('fun', optional($._unseparated_member_start))), 'interface')),
+          optional($._unseparated_member_start),
           field('name', $.identifier),
           optional($.type_parameters),
           optional(seq(optional($._primary_constructor_position), $.primary_constructor)),
@@ -221,6 +228,7 @@ module.exports = grammar({
         seq(
           optional($.modifiers),
           'object',
+          optional($._unseparated_member_start),
           field('name', $.identifier),
           optional(seq(':', $.delegation_specifiers)),
           optional($.class_body)
@@ -232,6 +240,7 @@ module.exports = grammar({
         seq(
           optional($.modifiers),
           choice('val', 'var'),
+          optional($._separated_member_start),
           optional($.type_parameters),
           optional(seq($._receiver_type, optional('.'))),
           choice($.variable_declaration, $.multi_variable_declaration),
@@ -244,7 +253,15 @@ module.exports = grammar({
 
     type_alias: ($) =>
       prec.right(
-        seq(optional($.modifiers), 'typealias', field('type', $.identifier), optional($.type_parameters), '=', $.type)
+        seq(
+          optional($.modifiers),
+          'typealias',
+          optional($._separated_member_start),
+          field('type', $.identifier),
+          optional($.type_parameters),
+          '=',
+          $.type
+        )
       ),
 
     companion_object: ($) =>
@@ -252,17 +269,19 @@ module.exports = grammar({
         optional($.modifiers),
         'companion',
         'object',
+        optional($._unseparated_member_start),
         optional(field('name', $.identifier)),
         optional(seq(':', $.delegation_specifiers)),
         optional($.class_body)
       ),
 
-    anonymous_initializer: ($) => seq('init', $.block),
+    anonymous_initializer: ($) => seq('init', optional($._unseparated_member_start), $.block),
 
     secondary_constructor: ($) =>
       seq(
         optional($.modifiers),
         'constructor',
+        optional($._unseparated_member_start),
         $.function_value_parameters,
         optional(seq(':', $.constructor_delegation_call)),
         optional($.block)
@@ -300,6 +319,7 @@ module.exports = grammar({
         seq(
           optional($.modifiers),
           'fun',
+          optional($._unseparated_member_start),
           optional($.type_parameters),
           optional(seq($._receiver_type, optional('.'))),
           field('name', $._identifier),
@@ -406,8 +426,10 @@ module.exports = grammar({
 
     _loop_prefix: ($) => prec.dynamic(1, repeat1(choice($.annotation, $.label))),
 
-    class_body: ($) =>
-      seq('{', $._open_members, repeat(seq($.class_member_declaration, $._class_member_semi)), '}', $._close_braces),
+    class_body: ($) => seq('{', $._open_members, repeat($._class_member_with_separator), '}', $._close_braces),
+
+    _class_member_with_separator: ($) =>
+      seq($.class_member_declaration, optional($._same_line_member_end), $._class_member_semi),
 
     class_member_declaration: ($) =>
       choice($.declaration, $.companion_object, $.anonymous_initializer, $.secondary_constructor),
@@ -419,7 +441,7 @@ module.exports = grammar({
         '{',
         $._open_members,
         optionalCommaSep1($.enum_entry),
-        optional(seq(';', repeat(seq($.class_member_declaration, $._class_member_semi)))),
+        optional(seq(';', repeat($._class_member_with_separator))),
         '}',
         $._close_braces
       ),
@@ -617,12 +639,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),

package/package.json

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

package/tree-sitter.json

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