@willbooster/tree-sitter-kotlin 1.2.0 → 1.3.1

package/README.md

@@ -1,6 +1,7 @@
 # @willbooster/tree-sitter-kotlin
 
 [![npm version](https://img.shields.io/npm/v/@willbooster/tree-sitter-kotlin.svg)](https://www.npmjs.com/package/@willbooster/tree-sitter-kotlin)
+[![crates.io](https://img.shields.io/crates/v/willbooster-tree-sitter-kotlin.svg)](https://crates.io/crates/willbooster-tree-sitter-kotlin)
 [![license](https://img.shields.io/npm/l/@willbooster/tree-sitter-kotlin.svg)](https://www.npmjs.com/package/@willbooster/tree-sitter-kotlin)
 [![Test](https://github.com/WillBooster/tree-sitter-kotlin/actions/workflows/test.yml/badge.svg)](https://github.com/WillBooster/tree-sitter-kotlin/actions/workflows/test.yml)
 [![Test rust](https://github.com/WillBooster/tree-sitter-kotlin/actions/workflows/test-rust.yml/badge.svg)](https://github.com/WillBooster/tree-sitter-kotlin/actions/workflows/test-rust.yml)
@@ -30,12 +31,12 @@ const tree = parser.parse('fun main() = println("Hello")\n');
 
 The package also ships the node types in `src/node-types.json`.
 
-In Rust, depend on the Git repository; the crate is not published to crates.io:
+In Rust, depend on the [crate](https://crates.io/crates/willbooster-tree-sitter-kotlin):
 
 ```toml
 [dependencies]
 tree-sitter = "0.27"
-tree-sitter-kotlin = { package = "willbooster-tree-sitter-kotlin", git = "https://github.com/WillBooster/tree-sitter-kotlin", tag = "v1.1.0" }
+tree-sitter-kotlin = { package = "willbooster-tree-sitter-kotlin", version = "1.2" }
 ```
 
 ```rust

package/grammar.js

@@ -41,6 +41,10 @@ module.exports = grammar({
     [$.annotated_expression, $.type_modifiers],
     [$.annotated_expression, $.type_modifiers, $.when_subject],
     [$.annotated_expression, $.type_modifiers, $.modifiers],
+    [$.variable_declaration, $._loop_prefix, $.modifiers, $.type_modifiers, $.annotated_expression],
+    [$._loop_prefix, $.annotated_expression],
+    [$._loop_prefix, $.modifiers, $.type_modifiers, $.annotated_expression],
+    [$._loop_prefix, $.labeled_expression],
     [$.parameter_modifiers, $.type_modifiers],
     [$.function_modifier, $.type_modifiers],
     [$.function_modifier, $._reserved_identifier],
@@ -286,7 +290,7 @@ module.exports = grammar({
     for_statement: ($) =>
       prec.right(
         seq(
-          optional($.label),
+          optional($._loop_prefix),
           'for',
           '(',
           repeat($.annotation),
@@ -301,7 +305,7 @@ module.exports = grammar({
     while_statement: ($) =>
       prec.right(
         seq(
-          optional($.label),
+          optional($._loop_prefix),
           'while',
           '(',
           field('condition', $.expression),
@@ -313,7 +317,7 @@ module.exports = grammar({
     do_while_statement: ($) =>
       prec.right(
         seq(
-          optional($.label),
+          optional($._loop_prefix),
           'do',
           optional(choice(field('body', choice($.block, $.statement)), ';')),
           'while',
@@ -323,6 +327,8 @@ module.exports = grammar({
         )
       ),
 
+    _loop_prefix: ($) => prec.dynamic(1, repeat1(choice($.annotation, $.label))),
+
     class_body: ($) => seq('{', repeat(seq($.class_member_declaration, $._class_member_semi)), '}'),
 
     class_member_declaration: ($) =>

package/package.json

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

package/src/node-types.json

@@ -958,9 +958,13 @@
       }
     },
     "children": {
-      "multiple": false,
+      "multiple": true,
       "required": false,
       "types": [
+        {
+          "type": "annotation",
+          "named": true
+        },
         {
           "type": "label",
           "named": true
@@ -2623,9 +2627,13 @@
       }
     },
     "children": {
-      "multiple": false,
+      "multiple": true,
       "required": false,
       "types": [
+        {
+          "type": "annotation",
+          "named": true
+        },
         {
           "type": "label",
           "named": true

package/tree-sitter.json

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