@willbooster/tree-sitter-java 9.0.0 → 9.0.2

package/grammar.js

@@ -14,6 +14,7 @@ const DIGITS = token(choice('0', seq(/[1-9]/, optional(seq(optional(/_+/), DECIM
 const HEX_DIGITS = token(sep1(/[A-Fa-f0-9]+/, /_+/));
 
 const PREC = {
+  LAMBDA: -1,
   // https://introcs.cs.princeton.edu/java/11precedence/
   COMMENT: 0,
   ASSIGN: 1,
@@ -82,7 +83,6 @@ module.exports = grammar({
     [$._unannotated_type, $.generic_type],
     [$.generic_type, $.primary_expression],
     [$.expression, $.statement],
-    [$.lambda_expression, $.primary_expression],
     [$.inferred_parameters, $.primary_expression],
     [$.argument_list, $.record_pattern_body],
     [$.yield_statement, $._reserved_identifier],
@@ -272,7 +272,7 @@ module.exports = grammar({
       '"""',
       repeat(choice(
         alias($._multiline_string_fragment, $.multiline_string_fragment),
-        $._escape_sequence,
+        $.escape_sequence,
         $.string_interpolation,
       )),
       '"""',
@@ -280,7 +280,7 @@ module.exports = grammar({
     string_fragment: _ => token.immediate(prec(1, /[^"\\]+/)),
     _multiline_string_fragment: _ => choice(
       /[^"\\]+/,
-      /"([^"\\]|\\")*/,
+      /"[^"\\]*/,
     ),
 
     string_interpolation: $ => seq(
@@ -289,10 +289,6 @@ module.exports = grammar({
       '}',
     ),
 
-    _escape_sequence: $ => choice(
-      prec(2, token.immediate(seq('\\', /[^bfnrts'\"\\]/))),
-      prec(1, $.escape_sequence),
-    ),
     escape_sequence: _ => token.immediate(choice(
       seq(/\\u+005[cC]/, choice(
         /(?:[0-3]|\\u+003[0-3])(?:[0-7]|\\u+003[0-7]){0,2}/,
@@ -302,6 +298,7 @@ module.exports = grammar({
       seq(
         choice('\\', /\\u+005[cC]/),
         choice(
+          '\r\n',
           /[^xu0-7]/,
           /(?:[0-3][0-7]{0,2}|[4-7][0-7]?)/,
           /x[0-9a-fA-F]{2}/,
@@ -404,13 +401,13 @@ module.exports = grammar({
       ),
     )),
 
-    lambda_expression: $ => seq(
+    lambda_expression: $ => prec(PREC.LAMBDA, seq(
       field('parameters', choice(
         $.identifier, $.formal_parameters, $.inferred_parameters, $._reserved_identifier, $.underscore_pattern,
       )),
       '->',
       field('body', choice($.expression, $.block)),
-    ),
+    )),
 
     inferred_parameters: $ => seq(
       '(',

package/package.json

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

package/tree-sitter.json

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