Merge pull requests #155 and #156

fwcd · Dec 18, 2024 · e30769c · e30769c
3 parents 76f53c4 + e6e376f + cd637ea
commit e30769c
Show file tree

Hide file tree

Showing 13 changed files with 740,365 additions and 545,361 deletions.
diff --git a/README.md b/README.md
@@ -38,6 +38,12 @@ To run the unit tests, run:
 
 >`npm run test`
 
+It is also helpful to run the parser on a real Kotlin project's source files.
+
+```shell
+./node_modules/.bin/tree-sitter parse "/path/to/some/project/**/*.kt"  --quiet --stat
+```
+
 ## WebAssembly
 
 ### Compilation

diff --git a/bindings/go/go.mod b/bindings/go/go.mod
@@ -0,0 +1,5 @@
+module github.com/tree-sitter/tree-sitter-kotlin
+
+go 1.22
+
+require github.com/smacker/go-tree-sitter v0.0.0-20230720070738-0d0a9f78d8f8
diff --git a/grammar.js b/grammar.js
@@ -94,7 +94,7 @@ module.exports = grammar({
     // ambiguity between multiple user types and class property/function declarations
     [$.user_type],
     [$.user_type, $.anonymous_function],
-    [$.user_type, $.function_type],
+    //[$.user_type, $.function_type],
 
     // ambiguity between annotated_lambda with modifiers and modifiers from var declarations
     [$.annotated_lambda, $.modifiers],
@@ -110,6 +110,9 @@ module.exports = grammar({
     [$.type_modifiers],
     // ambiguity between associating type modifiers
     [$.not_nullable_type],
+
+    [$.receiver_type],
+    [$.receiver_type, $._type],
   ],
 
   externals: $ => [
@@ -337,20 +340,20 @@ module.exports = grammar({
       optional(seq("=", $._expression))
     ),
 
-    _receiver_type: $ => seq(
+    receiver_type: $ => seq(
       optional($.type_modifiers),
       choice (
-        $._type_reference,
         $.parenthesized_type,
-        $.nullable_type
+        $.nullable_type,
+        $._type_reference,
       )
     ),
 
     function_declaration: $ => prec.right(seq( // TODO
       optional($.modifiers),
       "fun",
       optional($.type_parameters),
-      optional(seq($._receiver_type, optional('.'))),
+      optional(seq(field("receiver", $.receiver_type), optional('.'))),
       $.simple_identifier,
       $.function_value_parameters,
       optional(seq(":", $._type)),
@@ -370,7 +373,7 @@ module.exports = grammar({
       optional($.modifiers),
       $.binding_pattern_kind,
       optional($.type_parameters),
-      optional(seq($._receiver_type, optional('.'))),
+      optional(seq(field("receiver", $.receiver_type), optional('.'))),
       choice($.variable_declaration, $.multi_variable_declaration),
       optional($.type_constraints),
       optional(choice(
@@ -464,10 +467,10 @@ module.exports = grammar({
     _type: $ => seq(
       optional($.type_modifiers),
       choice(
+        $.function_type,
         $.parenthesized_type,
         $.nullable_type,
         $._type_reference,
-        $.function_type,
         $.not_nullable_type
       )
     ),
@@ -513,7 +516,7 @@ module.exports = grammar({
     _type_projection_modifier: $ => $.variance_modifier,
 
     function_type: $ => seq(
-      optional(seq($._simple_user_type, ".")), // TODO: Support "real" types
+      optional(seq(field("receiver", $.receiver_type), ".")),
       $.function_type_parameters,
       "->",
       $._type
@@ -623,7 +626,6 @@ module.exports = grammar({
 
     _unary_expression: $ => choice(
       $.postfix_expression,
-      $.call_expression,
       $.indexing_expression,
       $.navigation_expression,
       $.prefix_expression,
@@ -738,6 +740,7 @@ module.exports = grammar({
       $._literal_constant,
       $.string_literal,
       $.callable_reference,
+      $.call_expression,
       $._function_literal,
       $.object_literal,
       $.collection_literal,
@@ -751,7 +754,13 @@ module.exports = grammar({
 
     parenthesized_expression: $ => seq("(", $._expression, ")"),
 
-    collection_literal: $ => seq("[", $._expression, repeat(seq(",", $._expression)), "]"),
+    // https://kotlinlang.org/spec/syntax-and-grammar.html#grammar-rule-collectionLiteral
+    collection_literal: $ => seq(
+      "[",
+      $._expression,
+      repeat(seq(",", $._expression)),
+      optional(","),
+      "]"),
 
     _literal_constant: $ => choice(
       $.boolean_literal,
@@ -836,7 +845,7 @@ module.exports = grammar({
         seq(
           optional(field('consequence', $.control_structure_body)),
           optional(";"),
-          "else", 
+          "else",
           choice(field('alternative', $.control_structure_body), ";")
         ),
         ";"

diff --git a/package.json b/package.json
@@ -58,10 +58,7 @@
   "tree-sitter": [
     {
       "scope": "source.kotlin",
-      "file-types": [
-        "kt",
-        "kts"
-      ]
+      "injection-regex": "^kotlin$"
     }
   ]
 }
diff --git a/src/grammar.json b/src/grammar.json
@@ -1240,7 +1240,7 @@
         }
       ]
     },
-    "_receiver_type": {
+    "receiver_type": {
       "type": "SEQ",
       "members": [
         {
@@ -1260,15 +1260,15 @@
           "members": [
             {
               "type": "SYMBOL",
-              "name": "_type_reference"
+              "name": "parenthesized_type"
             },
             {
               "type": "SYMBOL",
-              "name": "parenthesized_type"
+              "name": "nullable_type"
             },
             {
               "type": "SYMBOL",
-              "name": "nullable_type"
+              "name": "_type_reference"
             }
           ]
         }
@@ -1315,8 +1315,12 @@
                 "type": "SEQ",
                 "members": [
                   {
-                    "type": "SYMBOL",
-                    "name": "_receiver_type"
+                    "type": "FIELD",
+                    "name": "receiver",
+                    "content": {
+                      "type": "SYMBOL",
+                      "name": "receiver_type"
+                    }
                   },
                   {
                     "type": "CHOICE",
@@ -1490,8 +1494,12 @@
                 "type": "SEQ",
                 "members": [
                   {
-                    "type": "SYMBOL",
-                    "name": "_receiver_type"
+                    "type": "FIELD",
+                    "name": "receiver",
+                    "content": {
+                      "type": "SYMBOL",
+                      "name": "receiver_type"
+                    }
                   },
                   {
                     "type": "CHOICE",
@@ -2175,19 +2183,19 @@
           "members": [
             {
               "type": "SYMBOL",
-              "name": "parenthesized_type"
+              "name": "function_type"
             },
             {
               "type": "SYMBOL",
-              "name": "nullable_type"
+              "name": "parenthesized_type"
             },
             {
               "type": "SYMBOL",
-              "name": "_type_reference"
+              "name": "nullable_type"
             },
             {
               "type": "SYMBOL",
-              "name": "function_type"
+              "name": "_type_reference"
             },
             {
               "type": "SYMBOL",
@@ -2408,8 +2416,12 @@
               "type": "SEQ",
               "members": [
                 {
-                  "type": "SYMBOL",
-                  "name": "_simple_user_type"
+                  "type": "FIELD",
+                  "name": "receiver",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "receiver_type"
+                  }
                 },
                 {
                   "type": "STRING",
@@ -2917,10 +2929,6 @@
           "type": "SYMBOL",
           "name": "postfix_expression"
         },
-        {
-          "type": "SYMBOL",
-          "name": "call_expression"
-        },
         {
           "type": "SYMBOL",
           "name": "indexing_expression"
@@ -3690,6 +3698,10 @@
           "type": "SYMBOL",
           "name": "callable_reference"
         },
+        {
+          "type": "SYMBOL",
+          "name": "call_expression"
+        },
         {
           "type": "SYMBOL",
           "name": "_function_literal"
@@ -3772,6 +3784,18 @@
             ]
           }
         },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "STRING",
+              "value": ","
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
         {
           "type": "STRING",
           "value": "]"
@@ -6329,10 +6353,6 @@
       "user_type",
       "anonymous_function"
     ],
-    [
-      "user_type",
-      "function_type"
-    ],
     [
       "annotated_lambda",
       "modifiers"
@@ -6354,6 +6374,13 @@
     ],
     [
       "not_nullable_type"
+    ],
+    [
+      "receiver_type"
+    ],
+    [
+      "receiver_type",
+      "_type"
     ]
   ],
   "precedences": [],