@willbooster/tree-sitter-kotlin 1.4.0 → 1.4.2

package/README.md

@@ -60,12 +60,15 @@ parser.setLanguage(await Language.load(kotlin));
 
 The package also ships the node types in `src/node-types.json`.
 
-In Rust, depend on the [crate](https://crates.io/crates/willbooster-tree-sitter-kotlin):
+In Rust, depend on the [crate](https://crates.io/crates/willbooster-tree-sitter-kotlin) and on
+[willbooster-tree-sitter](https://crates.io/crates/willbooster-tree-sitter), the runtime this package is tested and
+fuzzed with (the grammar also loads in the upstream `tree-sitter` crate 0.27, whose error recovery never ends on some
+malformed input):
 
 ```toml
 [dependencies]
-tree-sitter = "0.27"
-tree-sitter-kotlin = { package = "willbooster-tree-sitter-kotlin", version = "1.2" }
+tree-sitter = { package = "willbooster-tree-sitter", version = "1" }
+tree-sitter-kotlin = { package = "willbooster-tree-sitter-kotlin", version = "1" }
 ```
 
 ```rust

package/grammar.js

@@ -49,6 +49,8 @@ module.exports = grammar({
     [$.parameter_modifiers, $.type_modifiers],
     [$.function_modifier, $.type_modifiers],
     [$.function_modifier, $._reserved_identifier],
+    [$.function_modifier, $.type_modifiers, $._reserved_identifier],
+    [$.type_modifiers, $._reserved_identifier],
     [$.variable_declaration, $.type_modifiers],
     [$.variable_declaration, $.type_modifiers, $.modifiers, $.annotated_expression],
     [$.variable_declaration, $.type_modifiers, $.annotated_expression],
@@ -61,6 +63,9 @@ module.exports = grammar({
     [$.class_modifier, $._reserved_identifier],
     [$.platform_modifier, $._reserved_identifier],
     [$.property_modifier, $._reserved_identifier],
+    [$.inheritance_modifier, $._reserved_identifier],
+    [$.visibility_modifier, $._reserved_identifier],
+    [$.member_modifier, $._reserved_identifier],
 
     [$.explicit_delegation, $.expression],
     [$.qualified_identifier],
@@ -87,6 +92,10 @@ module.exports = grammar({
     'set',
     // used to check if we can parse a comment
     '$',
+    // used to check if a modifier alone on its line belongs to a declaration on the next line
+    'val',
+    // never scanned: it tells the scanner where a primary constructor may start
+    $._primary_constructor_position,
   ],
 
   inline: ($) => [$._statements, $._identifier, $._control_structure_body],
@@ -136,7 +145,7 @@ module.exports = grammar({
           choice('class', seq(optional('fun'), 'interface')),
           field('name', $.identifier),
           optional($.type_parameters),
-          optional($.primary_constructor),
+          optional(seq(optional($._primary_constructor_position), $.primary_constructor)),
           optional(seq(':', $.delegation_specifiers)),
           optional($.type_constraints),
           optional(choice($.class_body, $.enum_class_body))
@@ -371,17 +380,22 @@ module.exports = grammar({
         )
       ),
 
-    class_modifier: () => choice('enum', 'sealed', 'annotation', 'data', 'inner', 'value'),
+    // A modifier keyword that `_reserved_identifier` also accepts as a name makes `@A\nsealed interface B` parse as
+    // an infix call as well, since `interface` lexes as an identifier where no keyword is valid, so the modifier
+    // reading takes dynamic precedence. The name takes none: it would outweigh the modifiers again wherever a
+    // reading has more names, such as `get` calls in a class body misread as a trailing lambda.
+    class_modifier: () => prec.dynamic(1, choice('enum', 'sealed', 'annotation', 'data', 'inner', 'value')),
 
-    function_modifier: () => prec.right(choice('tailrec', 'operator', 'infix', 'inline', 'external', 'suspend')),
+    function_modifier: () =>
+      prec.dynamic(1, prec.right(choice('tailrec', 'operator', 'infix', 'inline', 'external', 'suspend'))),
 
-    property_modifier: () => 'const',
+    property_modifier: () => prec.dynamic(1, 'const'),
 
-    visibility_modifier: () => choice('public', 'private', 'protected', 'internal'),
+    visibility_modifier: () => prec.dynamic(1, choice('public', 'private', 'protected', 'internal')),
 
-    inheritance_modifier: () => choice('abstract', 'final', 'open'),
+    inheritance_modifier: () => prec.dynamic(1, choice('abstract', 'final', 'open')),
 
-    member_modifier: () => choice('override', 'lateinit'),
+    member_modifier: () => prec.dynamic(1, choice('override', 'lateinit')),
 
     parameter_modifiers: ($) => repeat1(choice($.annotation, $.parameter_modifier)),
 
@@ -389,7 +403,7 @@ module.exports = grammar({
 
     reification_modifier: () => 'reified',
 
-    platform_modifier: () => choice('expect', 'actual'),
+    platform_modifier: () => prec.dynamic(1, choice('expect', 'actual')),
 
     type_modifiers: ($) => prec.right(repeat1(choice($.annotation, 'suspend'))),
 
@@ -746,25 +760,37 @@ module.exports = grammar({
     identifier: () => token(choice(/[\p{L}_][\p{L}_\p{Nd}]*/u, /`[^\r\n`]+`/)),
 
     _reserved_identifier: ($) =>
-      prec.dynamic(
-        1,
-        alias(
-          choice(
-            'actual',
-            'annotation',
-            'constructor',
-            'const',
-            'data',
-            'enum',
-            'expect',
-            'inner',
-            'get',
-            'set',
-            'operator',
-            'value'
-          ),
-          $.identifier
-        )
+      alias(
+        choice(
+          'abstract',
+          'actual',
+          'annotation',
+          'const',
+          'constructor',
+          'data',
+          'enum',
+          'expect',
+          'external',
+          'final',
+          'get',
+          'infix',
+          'inline',
+          'inner',
+          'internal',
+          'lateinit',
+          'open',
+          'operator',
+          'override',
+          'private',
+          'protected',
+          'public',
+          'sealed',
+          'set',
+          'suspend',
+          'tailrec',
+          'value'
+        ),
+        $.identifier
       ),
 
     shebang: () => /#!.*/,

package/package.json

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

package/tree-sitter.json

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