fix "endless range" parsing

add more tests

Author: resolritter

corpus/expressions.txt

@@ -128,6 +128,9 @@ a..b;
 1..(1);
 (1)..1;
 (1)..(1);
+1..{1};
+for i in 1.. {
+}
 
 ---
 
@@ -146,7 +149,16 @@ a..b;
     (integer_literal))
   (range_expression
     (parenthesized_expression (integer_literal))
-    (parenthesized_expression (integer_literal))))
+    (parenthesized_expression (integer_literal)))
+  (range_expression
+    (integer_literal)
+    (block
+      (integer_literal)))
+  (for_expression
+    (identifier)
+    (range_expression
+      (integer_literal))
+    (block)))
 
 ============================================
 Assignment expressions

grammar.js

@@ -831,15 +831,14 @@ module.exports = grammar({
 
     // Section - Expressions
 
-    _expression: $ => choice(
+    _expression_except_range: $ => choice(
       $.unary_expression,
       $.reference_expression,
       $.try_expression,
       $.binary_expression,
       $.assignment_expression,
       $.compound_assignment_expr,
       $.type_cast_expression,
-      $.range_expression,
       $.call_expression,
       $.return_expression,
       $.yield_expression,
@@ -856,14 +855,19 @@ module.exports = grammar({
       $.tuple_expression,
       prec(1, $.macro_invocation),
       $.unit_expression,
-      $._expression_ending_with_block,
       $.break_expression,
       $.continue_expression,
       $.index_expression,
       $.metavariable,
       $.closure_expression,
       $.parenthesized_expression,
-      $.struct_expression
+      $.struct_expression,
+      $._expression_ending_with_block,
+    ),
+
+    _expression: $ => choice(
+      $._expression_except_range,
+      $.range_expression,
     ),
 
     _expression_ending_with_block: $ => choice(
@@ -921,10 +925,7 @@ module.exports = grammar({
     ),
 
     range_expression: $ => prec.left(PREC.range, choice(
-      prec.left(
-        PREC.range + 1,
-        seq($._expression, choice('..', '...', '..='), $._expression)
-      ),
+      seq($._expression, choice('..', '...', '..='), $._expression),
       seq($._expression, '..'),
       seq('..', $._expression),
       '..'
@@ -995,7 +996,7 @@ module.exports = grammar({
     ),
 
     call_expression: $ => prec(PREC.call, seq(
-      field('function', $._expression),
+      field('function', $._expression_except_range),
       field('arguments', $.arguments)
     )),