tree-sitter-java-orchard 0.5.10 → 0.5.16

package/grammar.js

@@ -269,6 +269,7 @@ export default grammar({
         $._reserved_identifier,
         $.field_access,
         $.array_access,
+        $.parenthesized_expression,
       )),
       field('operator', choice('=', '+=', '-=', '*=', '/=', '&=', '|=', '^=', '%=', '<<=', '>>=', '>>>=')),
       field('right', $.expression),
@@ -1079,12 +1080,14 @@ export default grammar({
       field('body', $.class_body),
     ),
 
-    annotation_type_declaration: $ => seq(
+    // disambiguate vs compact constructor w/ marker-annotation "interface"
+    annotation_type_declaration: $ => prec.dynamic(1, seq(
       optional($.modifiers),
-      '@interface',
+      '@',
+      'interface',
       field('name', $.identifier),
       field('body', $.annotation_type_body),
-    ),
+    )),
 
     annotation_type_body: $ => seq(
       '{',
@@ -1338,7 +1341,7 @@ export default grammar({
     super: _ => 'super',
 
     // https://docs.oracle.com/javase/specs/jls/se8/html/jls-3.html#jls-IdentifierChars
-    identifier: _ => /[\p{XID_Start}_$][\p{XID_Continue}\u00A2_$]*/,
+    identifier: _ => /[\p{ID_Start}\p{Nl}\p{Sc}\p{Pc}][\p{ID_Continue}\p{Nl}\p{Sc}\p{Pc}\p{Cf}]*/u,
 
     line_comment: _ => token(prec(PREC.COMMENT, seq('//', /[^\n]*/))),
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-java-orchard",
-  "version": "0.5.10",
+  "version": "0.5.16",
   "description": "Java grammar for tree-sitter",
   "type": "module",
   "repository": {
@@ -37,7 +37,7 @@
   "devDependencies": {
     "prebuildify": "^6.0.1",
     "tree-sitter": "^0.25.0",
-    "tree-sitter-cli": "^0.26.11"
+    "tree-sitter-cli": "^0.26.12"
   },
   "peerDependencies": {
     "tree-sitter": "^0.25.0"

package/src/grammar.json

@@ -1506,6 +1506,10 @@
                 {
                   "type": "SYMBOL",
                   "name": "array_access"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "parenthesized_expression"
                 }
               ]
             }
@@ -6508,41 +6512,49 @@
       ]
     },
     "annotation_type_declaration": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "CHOICE",
-          "members": [
-            {
+      "type": "PREC_DYNAMIC",
+      "value": 1,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "modifiers"
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          },
+          {
+            "type": "STRING",
+            "value": "@"
+          },
+          {
+            "type": "STRING",
+            "value": "interface"
+          },
+          {
+            "type": "FIELD",
+            "name": "name",
+            "content": {
               "type": "SYMBOL",
-              "name": "modifiers"
-            },
-            {
-              "type": "BLANK"
+              "name": "identifier"
+            }
+          },
+          {
+            "type": "FIELD",
+            "name": "body",
+            "content": {
+              "type": "SYMBOL",
+              "name": "annotation_type_body"
             }
-          ]
-        },
-        {
-          "type": "STRING",
-          "value": "@interface"
-        },
-        {
-          "type": "FIELD",
-          "name": "name",
-          "content": {
-            "type": "SYMBOL",
-            "name": "identifier"
-          }
-        },
-        {
-          "type": "FIELD",
-          "name": "body",
-          "content": {
-            "type": "SYMBOL",
-            "name": "annotation_type_body"
           }
-        }
-      ]
+        ]
+      }
     },
     "annotation_type_body": {
       "type": "SEQ",
@@ -7792,7 +7804,8 @@
     },
     "identifier": {
       "type": "PATTERN",
-      "value": "[\\p{XID_Start}_$][\\p{XID_Continue}\\u00A2_$]*"
+      "value": "[\\p{ID_Start}\\p{Nl}\\p{Sc}\\p{Pc}][\\p{ID_Continue}\\p{Nl}\\p{Sc}\\p{Pc}\\p{Cf}]*",
+      "flags": "u"
     },
     "line_comment": {
       "type": "TOKEN",

package/src/node-types.json

@@ -766,6 +766,10 @@
           {
             "type": "identifier",
             "named": true
+          },
+          {
+            "type": "parenthesized_expression",
+            "named": true
           }
         ]
       },
@@ -4312,10 +4316,6 @@
     "type": "@",
     "named": false
   },
-  {
-    "type": "@interface",
-    "named": false
-  },
   {
     "type": "[",
     "named": false