@willbooster/tree-sitter-kotlin 1.5.8 → 1.6.0

package/grammar.js

@@ -68,6 +68,11 @@ module.exports = grammar({
     [$.visibility_modifier, $._reserved_identifier],
     [$.member_modifier, $._reserved_identifier],
 
+    [$.context_parameters, $._reserved_identifier],
+    [$.modifiers, $.function_type],
+    [$.secondary_constructor, $._reserved_identifier],
+    [$.enum_entry, $.modifiers],
+    [$.modifiers, $.anonymous_function],
     [$.qualified_identifier],
     [$.constructor_invocation, $._unescaped_annotation],
     [$.nullable_type],
@@ -385,6 +390,8 @@ module.exports = grammar({
     class_member_declaration: ($) =>
       choice($.declaration, $.companion_object, $.anonymous_initializer, $.secondary_constructor),
 
+    _annotations: ($) => repeat1($.annotation),
+
     enum_class_body: ($) =>
       seq(
         '{',
@@ -393,7 +400,15 @@ module.exports = grammar({
         '}'
       ),
 
-    enum_entry: ($) => seq(optional($.modifiers), $.identifier, optional($.value_arguments), optional($.class_body)),
+    // Only annotations can modify an enum entry, and with the full modifier list a `context` after an annotation would
+    // start a context parameter list instead of naming the entry.
+    enum_entry: ($) =>
+      seq(
+        optional(alias($._annotations, $.modifiers)),
+        $._identifier,
+        optional($.value_arguments),
+        optional($.class_body)
+      ),
 
     value_arguments: ($) => seq('(', optionalCommaSep1($.value_argument), ')'),
 
@@ -421,7 +436,8 @@ module.exports = grammar({
               $.visibility_modifier,
               $.inheritance_modifier,
               $.parameter_modifier,
-              $.platform_modifier
+              $.platform_modifier,
+              $.context_parameters
             )
           )
         )
@@ -481,7 +497,24 @@ module.exports = grammar({
     type_projection: ($) => choice(seq(repeat($.variance_modifier), $.type), '*'),
 
     function_type: ($) =>
-      seq(optional($.type_modifiers), optional(seq($._receiver_type, '.')), $.function_type_parameters, '->', $.type),
+      seq(
+        optional($.type_modifiers),
+        optional($.context_parameters),
+        optional(seq($._receiver_type, '.')),
+        $.function_type_parameters,
+        '->',
+        $.type
+      ),
+
+    // Context parameters (`context(scope: Scope)`, Kotlin 2.2) and the older context receivers (`context(Scope)`).
+    context_parameters: ($) =>
+      seq(
+        'context',
+        '(',
+        commaSep1(choice(seq(optional($.parameter_modifiers), $.parameter), $.type)),
+        optional(','),
+        ')'
+      ),
 
     function_type_parameters: ($) => seq('(', optionalCommaSep1(choice($.parameter, $.type)), ')'),
 
@@ -625,6 +658,7 @@ module.exports = grammar({
     anonymous_function: ($) =>
       prec.right(
         seq(
+          optional($.context_parameters),
           'fun',
           optional(seq($.type, '.')),
           $.function_value_parameters,
@@ -769,23 +803,21 @@ module.exports = grammar({
         )
       ),
 
-    interpolation: ($) =>
+    interpolation: ($) => choice(seq('$', $._template_name), seq('${', $.expression, '}')),
+
+    // Immediate so that it outranks the string content that would otherwise absorb the name. As in Kotlin, `$this`
+    // refers to `this`: with the same token precedence as the name pattern, the string token wins a match of equal
+    // length (without its `prec(2)`, `$this` lexes as a name again), while a longer name such as `$thisX` still wins.
+    _template_name: ($) =>
       choice(
-        // Immediate so that it outranks the string content that would otherwise absorb the name.
-        seq('$', alias(token.immediate(prec(2, /[\p{L}_][\p{L}_\p{Nd}]*/u)), $.identifier)),
-        seq('${', $.expression, '}')
+        alias(token.immediate(prec(2, /[\p{L}_][\p{L}_\p{Nd}]*/u)), $.identifier),
+        alias(token.immediate(prec(2, 'this')), $.this_expression)
       ),
 
     // In a string prefixed with n dollars (Kotlin 2.1), exactly n dollars start an interpolation; the scanner
     // returns them as one token only where they do.
     _multi_dollar_interpolation: ($) =>
-      seq(
-        $._multi_dollar_interpolation_start,
-        choice(
-          alias(token.immediate(prec(2, /[\p{L}_][\p{L}_\p{Nd}]*/u)), $.identifier),
-          seq(token.immediate('{'), $.expression, '}')
-        )
-      ),
+      seq($._multi_dollar_interpolation_start, choice($._template_name, seq(token.immediate('{'), $.expression, '}'))),
 
     character_literal: ($) => seq("'", choice(token.immediate(prec(1, /[^'\\\r\n]/)), $.escape_sequence), "'"),
 
@@ -863,7 +895,8 @@ module.exports = grammar({
           'set',
           'suspend',
           'tailrec',
-          'value'
+          'value',
+          'context'
         ),
         $.identifier
       ),

package/package.json

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

package/src/node-types.json

@@ -332,6 +332,10 @@
       "multiple": true,
       "required": true,
       "types": [
+        {
+          "type": "context_parameters",
+          "named": true
+        },
         {
           "type": "function_body",
           "named": true
@@ -870,6 +874,29 @@
       ]
     }
   },
+  {
+    "type": "context_parameters",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "parameter",
+          "named": true
+        },
+        {
+          "type": "parameter_modifiers",
+          "named": true
+        },
+        {
+          "type": "type",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "continue_expression",
     "named": true,
@@ -1231,6 +1258,10 @@
       "multiple": true,
       "required": true,
       "types": [
+        {
+          "type": "context_parameters",
+          "named": true
+        },
         {
           "type": "function_type_parameters",
           "named": true
@@ -1486,6 +1517,10 @@
         {
           "type": "identifier",
           "named": true
+        },
+        {
+          "type": "this_expression",
+          "named": true
         }
       ]
     }
@@ -1594,6 +1629,10 @@
           "type": "class_modifier",
           "named": true
         },
+        {
+          "type": "context_parameters",
+          "named": true
+        },
         {
           "type": "function_modifier",
           "named": true
@@ -2962,6 +3001,10 @@
     "type": "constructor",
     "named": false
   },
+  {
+    "type": "context",
+    "named": false
+  },
   {
     "type": "continue",
     "named": false

package/tree-sitter.json

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