tree-sitter-java-orchard 0.5.5 → 0.5.6

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),
@@ -528,7 +529,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(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-java-orchard",
-  "version": "0.5.5",
+  "version": "0.5.6",
   "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"
                     }
                   },
                   {
@@ -3595,6 +3595,18 @@
     "type_pattern": {
       "type": "SEQ",
       "members": [
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "modifiers"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
         {
           "type": "SYMBOL",
           "name": "_unannotated_type"
@@ -7742,6 +7754,9 @@
     }
   ],
   "conflicts": [
+    [
+      "modifiers"
+    ],
     [
       "modifiers",
       "annotated_type",

package/src/node-types.json

@@ -2258,11 +2258,21 @@
         "required": false,
         "types": [
           {
-            "type": "_type",
+            "type": "_unannotated_type",
             "named": true
           }
         ]
       }
+    },
+    "children": {
+      "multiple": false,
+      "required": false,
+      "types": [
+        {
+          "type": "modifiers",
+          "named": true
+        }
+      ]
     }
   },
   {
@@ -3898,6 +3908,10 @@
         {
           "type": "identifier",
           "named": true
+        },
+        {
+          "type": "modifiers",
+          "named": true
         }
       ]
     }