tree-sitter-java-orchard 0.5.5 → 0.5.7

package/grammar.js

@@ -73,6 +73,7 @@ module.exports = grammar({
   ],
 
   conflicts: $ => [
+    [$.modifiers],
     [$.modifiers, $.annotated_type, $.receiver_parameter],
     [$.modifiers, $.annotated_type, $.module_declaration, $.package_declaration],
     [$._unannotated_type, $.primary_expression, $.inferred_parameters],
@@ -306,10 +307,10 @@ module.exports = grammar({
     instanceof_expression: $ => prec(PREC.REL, seq(
       field('left', $.expression),
       'instanceof',
-      optional('final'),
+      optional($.modifiers),
       choice(
         seq(
-          field('right', $._type),
+          field('right', $._unannotated_type),
           optional(field('name', choice($.identifier, $._reserved_identifier))),
         ),
         field('pattern', $.record_pattern),
@@ -517,7 +518,16 @@ module.exports = grammar({
       seq('case',
         choice(
           commaSep1($.pattern),
-          commaSep1($.expression),
+          commaSep1(
+            choice(
+              $.binary_expression,
+              $.instanceof_expression,
+              $.ternary_expression,
+              $.primary_expression,
+              $.unary_expression,
+              $.cast_expression,
+            ),
+          ),
         ),
         optional($.guard),
       ),
@@ -528,7 +538,7 @@ module.exports = grammar({
       $.type_pattern,
       $.record_pattern,
     ),
-    type_pattern: $ => seq($._unannotated_type, choice($.identifier, $._reserved_identifier)),
+    type_pattern: $ => seq(optional($.modifiers), $._unannotated_type, choice($.identifier, $._reserved_identifier)),
     record_pattern: $ => seq(choice($.identifier, $._reserved_identifier, $.generic_type, $.scoped_type_identifier), $.record_pattern_body),
     record_pattern_body: $ => seq('(', commaSep(choice($.record_pattern_component, $.record_pattern)), ')'),
     record_pattern_component: $ => choice(
@@ -542,7 +552,20 @@ module.exports = grammar({
 
     underscore_pattern: _ => '_',
 
-    guard: $ => seq('when', $.expression),
+    guard: $ => seq(
+      'when',
+      choice(
+        $.assignment_expression,
+        $.binary_expression,
+        $.instanceof_expression,
+        $.ternary_expression,
+        $.update_expression,
+        $.primary_expression,
+        $.unary_expression,
+        $.cast_expression,
+        $.switch_expression,
+      ),
+    ),
 
     // Statements
 
@@ -838,8 +861,8 @@ module.exports = grammar({
       'provides',
       field('provided', $._name),
       'with',
-      $._name,
-      repeat(seq(',', (field('provider', $._name)))),
+      field('provider', $._name),
+      repeat(seq(',', field('provider', $._name))),
       ';',
     ),
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-java-orchard",
-  "version": "0.5.5",
+  "version": "0.5.7",
   "description": "Java grammar for tree-sitter",
   "repository": "https://codeberg.org/grammar-orchard/tree-sitter-java-orchard",
   "license": "MIT",

package/src/grammar.json

@@ -2232,8 +2232,8 @@
             "type": "CHOICE",
             "members": [
               {
-                "type": "STRING",
-                "value": "final"
+                "type": "SYMBOL",
+                "name": "modifiers"
               },
               {
                 "type": "BLANK"
@@ -2251,7 +2251,7 @@
                     "name": "right",
                     "content": {
                       "type": "SYMBOL",
-                      "name": "_type"
+                      "name": "_unannotated_type"
                     }
                   },
                   {
@@ -3536,8 +3536,33 @@
                   "type": "SEQ",
                   "members": [
                     {
-                      "type": "SYMBOL",
-                      "name": "expression"
+                      "type": "CHOICE",
+                      "members": [
+                        {
+                          "type": "SYMBOL",
+                          "name": "binary_expression"
+                        },
+                        {
+                          "type": "SYMBOL",
+                          "name": "instanceof_expression"
+                        },
+                        {
+                          "type": "SYMBOL",
+                          "name": "ternary_expression"
+                        },
+                        {
+                          "type": "SYMBOL",
+                          "name": "primary_expression"
+                        },
+                        {
+                          "type": "SYMBOL",
+                          "name": "unary_expression"
+                        },
+                        {
+                          "type": "SYMBOL",
+                          "name": "cast_expression"
+                        }
+                      ]
                     },
                     {
                       "type": "REPEAT",
@@ -3549,8 +3574,33 @@
                             "value": ","
                           },
                           {
-                            "type": "SYMBOL",
-                            "name": "expression"
+                            "type": "CHOICE",
+                            "members": [
+                              {
+                                "type": "SYMBOL",
+                                "name": "binary_expression"
+                              },
+                              {
+                                "type": "SYMBOL",
+                                "name": "instanceof_expression"
+                              },
+                              {
+                                "type": "SYMBOL",
+                                "name": "ternary_expression"
+                              },
+                              {
+                                "type": "SYMBOL",
+                                "name": "primary_expression"
+                              },
+                              {
+                                "type": "SYMBOL",
+                                "name": "unary_expression"
+                              },
+                              {
+                                "type": "SYMBOL",
+                                "name": "cast_expression"
+                              }
+                            ]
                           }
                         ]
                       }
@@ -3595,6 +3645,18 @@
     "type_pattern": {
       "type": "SEQ",
       "members": [
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "modifiers"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
         {
           "type": "SYMBOL",
           "name": "_unannotated_type"
@@ -3763,8 +3825,45 @@
           "value": "when"
         },
         {
-          "type": "SYMBOL",
-          "name": "expression"
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "assignment_expression"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "binary_expression"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "instanceof_expression"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "ternary_expression"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "update_expression"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "primary_expression"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "unary_expression"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "cast_expression"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "switch_expression"
+            }
+          ]
         }
       ]
     },
@@ -5262,8 +5361,12 @@
           "value": "with"
         },
         {
-          "type": "SYMBOL",
-          "name": "_name"
+          "type": "FIELD",
+          "name": "provider",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_name"
+          }
         },
         {
           "type": "REPEAT",
@@ -7742,6 +7845,9 @@
     }
   ],
   "conflicts": [
+    [
+      "modifiers"
+    ],
     [
       "modifiers",
       "annotated_type",

package/src/node-types.json

@@ -2139,7 +2139,39 @@
       "required": true,
       "types": [
         {
-          "type": "expression",
+          "type": "assignment_expression",
+          "named": true
+        },
+        {
+          "type": "binary_expression",
+          "named": true
+        },
+        {
+          "type": "cast_expression",
+          "named": true
+        },
+        {
+          "type": "instanceof_expression",
+          "named": true
+        },
+        {
+          "type": "primary_expression",
+          "named": true
+        },
+        {
+          "type": "switch_expression",
+          "named": true
+        },
+        {
+          "type": "ternary_expression",
+          "named": true
+        },
+        {
+          "type": "unary_expression",
+          "named": true
+        },
+        {
+          "type": "update_expression",
           "named": true
         }
       ]
@@ -2258,11 +2290,21 @@
         "required": false,
         "types": [
           {
-            "type": "_type",
+            "type": "_unannotated_type",
             "named": true
           }
         ]
       }
+    },
+    "children": {
+      "multiple": false,
+      "required": false,
+      "types": [
+        {
+          "type": "modifiers",
+          "named": true
+        }
+      ]
     }
   },
   {
@@ -2961,7 +3003,7 @@
       },
       "provider": {
         "multiple": true,
-        "required": false,
+        "required": true,
         "types": [
           {
             "type": "identifier",
@@ -2973,20 +3015,6 @@
           }
         ]
       }
-    },
-    "children": {
-      "multiple": false,
-      "required": true,
-      "types": [
-        {
-          "type": "identifier",
-          "named": true
-        },
-        {
-          "type": "scoped_identifier",
-          "named": true
-        }
-      ]
     }
   },
   {
@@ -3563,16 +3591,36 @@
       "required": false,
       "types": [
         {
-          "type": "expression",
+          "type": "binary_expression",
+          "named": true
+        },
+        {
+          "type": "cast_expression",
           "named": true
         },
         {
           "type": "guard",
           "named": true
         },
+        {
+          "type": "instanceof_expression",
+          "named": true
+        },
         {
           "type": "pattern",
           "named": true
+        },
+        {
+          "type": "primary_expression",
+          "named": true
+        },
+        {
+          "type": "ternary_expression",
+          "named": true
+        },
+        {
+          "type": "unary_expression",
+          "named": true
         }
       ]
     }
@@ -3898,6 +3946,10 @@
         {
           "type": "identifier",
           "named": true
+        },
+        {
+          "type": "modifiers",
+          "named": true
         }
       ]
     }