@willbooster/tree-sitter-java 3.1.0 → 3.1.2

package/grammar.js

@@ -80,7 +80,6 @@ module.exports = grammar({
     [$.modifiers, $.annotated_type, $.module_declaration, $.package_declaration],
     [$._unannotated_type, $.primary_expression, $.inferred_parameters],
     [$._unannotated_type, $.primary_expression],
-    [$._unannotated_type, $.primary_expression, $.scoped_type_identifier],
     [$._unannotated_type, $.scoped_type_identifier],
     [$._unannotated_type, $.generic_type],
     [$.generic_type, $.primary_expression],
@@ -90,8 +89,70 @@ module.exports = grammar({
     [$.inferred_parameters, $.primary_expression],
     [$.argument_list, $.record_pattern_body],
     [$.yield_statement, $._reserved_identifier],
+    [$.scoped_identifier, $.scoped_type_identifier],
+    [$.primary_expression, $.method_reference, $.scoped_identifier],
+    [$.primary_expression, $.method_reference, $.scoped_identifier, $._unannotated_type, $.scoped_type_identifier],
   ],
 
+  reserved: {
+    global: $ => [
+      'abstract',
+      'assert',
+      'boolean',
+      'break',
+      'byte',
+      'case',
+      'catch',
+      'char',
+      'class',
+      $._const,
+      'continue',
+      'default',
+      'do',
+      'double',
+      'else',
+      'enum',
+      'extends',
+      'final',
+      'finally',
+      'float',
+      'for',
+      $._goto,
+      'if',
+      'implements',
+      'import',
+      'instanceof',
+      'int',
+      'interface',
+      'long',
+      'native',
+      'new',
+      'package',
+      'private',
+      'protected',
+      'public',
+      'return',
+      'short',
+      'static',
+      'strictfp',
+      $.super,
+      'switch',
+      'synchronized',
+      $.this,
+      'throw',
+      'throws',
+      'transient',
+      'try',
+      'void',
+      'volatile',
+      'while',
+      $.underscore_pattern,
+      $.true,
+      $.false,
+      $.null_literal,
+    ],
+  },
+
   word: $ => $.identifier,
 
   rules: {
@@ -164,15 +225,41 @@ module.exports = grammar({
 
     false: _ => 'false',
 
-    character_literal: _ => token(seq(
-      '\'',
-      repeat1(choice(
-        /[^\\'\n]/,
-        /\\./,
-        /\\\n/,
-      )),
-      '\'',
-    )),
+    character_literal: _ => {
+      const incompleteUnicode = /\\u+[0-9a-fA-F]{0,3}/;
+      const malformedUnicode = /\\u+([0-9a-fA-F]{1,3}[^0-9a-fA-F\\'\n]|[^0-9a-fA-Fu\\'\n])/;
+      const encodedBackslash = /\\u+005[cC]/;
+      const unicodeCharacter = /\\u+([1-9a-fA-F][0-9a-fA-F]{3}|0[1-9a-fA-F][0-9a-fA-F]{2}|00[0-46-9a-fA-F][0-9a-fA-F]|005[0-9abd-fABD-F])/;
+      const plainCharacter = /[^\\'\n]/;
+      const rawEscape = /\\[^u]/;
+      const boundedEscape = choice(
+        malformedUnicode,
+        rawEscape,
+        unicodeCharacter,
+        seq(encodedBackslash, choice(encodedBackslash, /[^'\n]/, /\n/)),
+      );
+      const boundedTail = seq(
+        repeat(choice(
+          plainCharacter,
+          seq(repeat(incompleteUnicode), boundedEscape),
+        )),
+        repeat(incompleteUnicode),
+        optional(encodedBackslash),
+      );
+      const character = choice(
+        plainCharacter,
+        rawEscape,
+        unicodeCharacter,
+        seq(encodedBackslash, choice(encodedBackslash, /./, /\n/)),
+      );
+      return token(seq('\'', choice(
+        repeat1(character),
+        seq(repeat(character), repeat1(incompleteUnicode)),
+        seq(repeat(character), malformedUnicode, boundedTail),
+        seq(repeat(character), repeat1(incompleteUnicode), boundedEscape, boundedTail),
+        seq(repeat(character), repeat1(incompleteUnicode), encodedBackslash),
+      ), '\''));
+    },
 
     string_literal: $ => choice($._string_literal, $._multiline_string_literal),
     _string_literal: $ => seq(
@@ -213,15 +300,23 @@ module.exports = grammar({
       prec(2, token.immediate(seq('\\', /[^bfnrts'\"\\]/))),
       prec(1, $.escape_sequence),
     ),
-    escape_sequence: _ => token.immediate(seq(
-      '\\',
-      choice(
-        /[^xu0-7]/,
-        /[0-7]{1,3}/,
-        /x[0-9a-fA-F]{2}/,
-        /u[0-9a-fA-F]{4}/,
-        /u\{[0-9a-fA-F]+\}/,
-      ))),
+    escape_sequence: _ => token.immediate(choice(
+      seq(/\\u+005[cC]/, choice(
+        /(?:[0-3]|\\u+003[0-3])(?:[0-7]|\\u+003[0-7]){0,2}/,
+        /(?:[4-7]|\\u+003[4-7])(?:[0-7]|\\u+003[0-7])?/,
+        /\\u+[0-9a-fA-F]{4}/,
+      )),
+      seq(
+        choice('\\', /\\u+005[cC]/),
+        choice(
+          /[^xu0-7]/,
+          /(?:[0-3][0-7]{0,2}|[4-7][0-7]?)/,
+          /x[0-9a-fA-F]{2}/,
+          /u+[0-9a-fA-F]{4}/,
+          /u\{[0-9a-fA-F]+\}/,
+        ),
+      ),
+    )),
 
     null_literal: _ => 'null',
 
@@ -309,7 +404,7 @@ module.exports = grammar({
 
     lambda_expression: $ => seq(
       field('parameters', choice(
-        $.identifier, $.formal_parameters, $.inferred_parameters, $._reserved_identifier,
+        $.identifier, $.formal_parameters, $.inferred_parameters, $._reserved_identifier, $.underscore_pattern,
       )),
       '->',
       field('body', choice($.expression, $.block)),
@@ -317,7 +412,7 @@ module.exports = grammar({
 
     inferred_parameters: $ => seq(
       '(',
-      commaSep1(choice($.identifier, $._reserved_identifier)),
+      commaSep1(choice($.identifier, $._reserved_identifier, $.underscore_pattern)),
       ')',
     ),
 
@@ -450,11 +545,19 @@ module.exports = grammar({
 
     argument_list: $ => seq('(', commaSep($.expression), ')'),
 
-    method_reference: $ => seq(
-      choice($._type, $.primary_expression, $.super),
-      '::',
-      optional($.type_arguments),
-      choice('new', $.identifier),
+    method_reference: $ => choice(
+      seq(
+        choice($._type, $.primary_expression, $.super),
+        '::',
+        optional($.type_arguments),
+        choice('new', $.identifier),
+      ),
+      seq(
+        $._name, '.', $.super,
+        '::',
+        optional($.type_arguments),
+        $.identifier,
+      ),
     ),
 
     type_arguments: $ => seq(
@@ -1279,6 +1382,9 @@ module.exports = grammar({
       alias('yield', $.identifier),
     ),
 
+    _const: _ => /const/,
+    _goto: _ => /goto/,
+
     this: _ => 'this',
 
     super: _ => 'super',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-java",
-  "version": "3.1.0",
+  "version": "3.1.2",
   "description": "Java grammar for tree-sitter",
   "keywords": [
     "incremental",

package/src/node-types.json

@@ -2249,6 +2249,10 @@
         {
           "type": "identifier",
           "named": true
+        },
+        {
+          "type": "underscore_pattern",
+          "named": true
         }
       ]
     }
@@ -2459,6 +2463,10 @@
           {
             "type": "inferred_parameters",
             "named": true
+          },
+          {
+            "type": "underscore_pattern",
+            "named": true
           }
         ]
       }
@@ -2684,6 +2692,10 @@
           "type": "primary_expression",
           "named": true
         },
+        {
+          "type": "scoped_identifier",
+          "named": true
+        },
         {
           "type": "super",
           "named": true

package/tree-sitter.json

@@ -14,7 +14,7 @@
     }
   ],
   "metadata": {
-    "version": "3.1.0",
+    "version": "3.1.2",
     "license": "MIT",
     "description": "Java grammar for tree-sitter",
     "authors": [