tree-sitter-java-orchard 0.5.4 → 0.5.6

package/grammar.js

@@ -9,9 +9,9 @@
 /// <reference types="tree-sitter-cli/dsl" />
 // @ts-check
 
-const DIGITS = token(choice('0', seq(/[1-9]/, optional(seq(optional('_'), sep1(/[0-9]+/, /_+/))))));
-const DECIMAL_DIGITS = token(sep1(/[0-9]+/, '_'));
-const HEX_DIGITS = token(sep1(/[A-Fa-f0-9]+/, '_'));
+const DIGITS = token(choice('0', seq(/[1-9]/, optional(seq(optional(/_+/), sep1(/[0-9]+/, /_+/))))));
+const DECIMAL_DIGITS = token(sep1(/[0-9]+/, /_+/));
+const HEX_DIGITS = token(sep1(/[A-Fa-f0-9]+/, /_+/));
 
 /* eslint-disable no-multi-spaces */
 
@@ -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],
@@ -129,21 +130,22 @@ module.exports = grammar({
 
     octal_integer_literal: _ => token(seq(
       choice('0o', '0O', '0'),
-      sep1(/[0-7]+/, '_'),
+      optional(/_+/),
+      sep1(/[0-7]+/, /_+/),
       optional(choice('l', 'L')),
     )),
 
     binary_integer_literal: _ => token(seq(
       choice('0b', '0B'),
-      sep1(/[01]+/, '_'),
+      sep1(/[01]+/, /_+/),
       optional(choice('l', 'L')),
     )),
 
     decimal_floating_point_literal: _ => token(choice(
       seq(DECIMAL_DIGITS, '.', optional(DECIMAL_DIGITS), optional(seq((/[eE]/), optional(choice('-', '+')), DECIMAL_DIGITS)), optional(/[fFdD]/)),
       seq('.', DECIMAL_DIGITS, optional(seq((/[eE]/), optional(choice('-', '+')), DECIMAL_DIGITS)), optional(/[fFdD]/)),
-      seq(DIGITS, /[eE]/, optional(choice('-', '+')), DECIMAL_DIGITS, optional(/[fFdD]/)),
-      seq(DIGITS, optional(seq((/[eE]/), optional(choice('-', '+')), DECIMAL_DIGITS)), (/[fFdD]/)),
+      seq(DECIMAL_DIGITS, /[eE]/, optional(choice('-', '+')), DECIMAL_DIGITS, optional(/[fFdD]/)),
+      seq(DECIMAL_DIGITS, optional(seq((/[eE]/), optional(choice('-', '+')), DECIMAL_DIGITS)), (/[fFdD]/)),
     )),
 
     hex_floating_point_literal: _ => token(seq(
@@ -155,7 +157,7 @@ module.exports = grammar({
       optional(seq(
         /[pP]/,
         optional(choice('-', '+')),
-        DIGITS,
+        DECIMAL_DIGITS,
         optional(/[fFdD]/),
       )),
     )),
@@ -192,7 +194,7 @@ module.exports = grammar({
       '"""',
       repeat(choice(
         alias($._multiline_string_fragment, $.multiline_string_fragment),
-        $._escape_sequence,
+        $.escape_sequence,
         $.string_interpolation,
       )),
       '"""',
@@ -213,10 +215,6 @@ module.exports = grammar({
       '}',
     ),
 
-    _escape_sequence: $ => choice(
-      prec(2, token.immediate(seq('\\', /[^bfnrts'\"\\]/))),
-      prec(1, $.escape_sequence),
-    ),
     escape_sequence: _ => token.immediate(seq(
       choice('\\', /\\u+005[cC]/),
       choice(
@@ -255,7 +253,13 @@ module.exports = grammar({
         '(',
         sep1(field('type', $._type), '&'),
         ')',
-        field('value', choice($.primary_expression, $.lambda_expression)),
+        field('value', choice(
+          $.primary_expression,
+          alias($._unary_complement_expression, $.unary_expression),
+          $.cast_expression,
+          $.switch_expression,
+          $.lambda_expression,
+        )),
       ),
     )),
 
@@ -303,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),
@@ -335,17 +339,17 @@ module.exports = grammar({
       field('alternative', $.expression),
     )),
 
-    unary_expression: $ => choice(...[
-      ['+', PREC.UNARY],
-      ['-', PREC.UNARY],
-      ['!', PREC.UNARY],
-      ['~', PREC.UNARY],
-    ].map(([operator, precedence]) =>
-      prec.left(precedence, seq(
-        // @ts-ignore
-        field('operator', operator),
+    unary_expression: $ => choice(
+      $._unary_complement_expression,
+      prec.right(PREC.UNARY, seq(
+        field('operator', choice('+', '-')),
         field('operand', $.expression),
       )),
+    ),
+
+    _unary_complement_expression: $ => prec.right(PREC.UNARY, seq(
+      field('operator', choice('~', '!')),
+      field('operand', $.expression),
     )),
 
     update_expression: $ => prec.left(PREC.UNARY, choice(
@@ -525,12 +529,13 @@ module.exports = grammar({
       $.type_pattern,
       $.record_pattern,
     ),
-    type_pattern: $ => seq($._unannotated_type, choice($.identifier, $._reserved_identifier)),
-    record_pattern: $ => seq(choice($.identifier, $._reserved_identifier, $.generic_type), $.record_pattern_body),
+    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(
       $.underscore_pattern,
       seq(
+        optional($.modifiers),
         $._unannotated_type,
         choice($.identifier, $._reserved_identifier),
       ),
@@ -1002,8 +1007,7 @@ module.exports = grammar({
 
     constructor_body: $ => seq(
       '{',
-      optional($.explicit_constructor_invocation),
-      repeat($.statement),
+      repeat(choice($.explicit_constructor_invocation, $.statement)),
       '}',
     ),
 
@@ -1068,6 +1072,7 @@ module.exports = grammar({
         $.class_declaration,
         $.interface_declaration,
         $.enum_declaration,
+        $.record_declaration,
         $.annotation_type_declaration,
         ';',
       )),

package/package.json

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