Fix: Parses more one-line statements without/with many EOL.

acristoffers · Jul 2, 2023 · ae09222 · ae09222
1 parent 4029fa7
commit ae09222
Show file tree

Hide file tree

Showing 8 changed files with 22,784 additions and 21,673 deletions.
diff --git a/grammar.js b/grammar.js
@@ -490,7 +490,7 @@ module.exports = grammar({
         seq(
           choice('for', 'parfor'),
           $.iterator,
-          $._end_of_line,
+          repeat($._end_of_line),
           optional($.block),
           'end'
         ),
@@ -501,7 +501,7 @@ module.exports = grammar({
           ',',
           $.parfor_options,
           ')',
-          $._end_of_line,
+          repeat($._end_of_line),
           optional($.block),
           'end'
         )
@@ -511,7 +511,7 @@ module.exports = grammar({
       seq(
         'while',
         field('condition', $._expression),
-        $._end_of_line,
+        repeat($._end_of_line),
         optional($.block),
         'end'
       ),
@@ -521,16 +521,16 @@ module.exports = grammar({
         'case',
         // MATLAB says it should be a `switch_expr`, but then accepts any expression
         field('condition', $._expression),
-        $._end_of_line,
+        repeat1($._end_of_line),
         optional($.block)
       ),
     otherwise_clause: ($) =>
-      seq('otherwise', $._end_of_line, optional($.block)),
+      seq('otherwise', repeat($._end_of_line), optional($.block)),
     switch_statement: ($) =>
       seq(
         'switch',
         field('condition', $._expression),
-        $._end_of_line,
+        repeat($._end_of_line),
         repeat($.case_clause),
         optional($.otherwise_clause),
         'end'
@@ -703,11 +703,16 @@ module.exports = grammar({
       ),
 
     catch_clause: ($) =>
-      seq('catch', optional($.identifier), $._end_of_line, optional($.block)),
+      seq(
+        'catch',
+        optional($.identifier),
+        repeat1($._end_of_line),
+        optional($.block)
+      ),
     try_statement: ($) =>
       seq(
         'try',
-        optional($._end_of_line),
+        repeat($._end_of_line),
         optional($.block),
         optional($.catch_clause),
         'end'

diff --git a/src/grammar.json b/src/grammar.json
@@ -2228,8 +2228,11 @@
               "name": "iterator"
             },
             {
-              "type": "SYMBOL",
-              "name": "_end_of_line"
+              "type": "REPEAT",
+              "content": {
+                "type": "SYMBOL",
+                "name": "_end_of_line"
+              }
             },
             {
               "type": "CHOICE",
@@ -2277,8 +2280,11 @@
               "value": ")"
             },
             {
-              "type": "SYMBOL",
-              "name": "_end_of_line"
+              "type": "REPEAT",
+              "content": {
+                "type": "SYMBOL",
+                "name": "_end_of_line"
+              }
             },
             {
               "type": "CHOICE",
@@ -2316,8 +2322,11 @@
           }
         },
         {
-          "type": "SYMBOL",
-          "name": "_end_of_line"
+          "type": "REPEAT",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_end_of_line"
+          }
         },
         {
           "type": "CHOICE",
@@ -2353,8 +2362,11 @@
           }
         },
         {
-          "type": "SYMBOL",
-          "name": "_end_of_line"
+          "type": "REPEAT1",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_end_of_line"
+          }
         },
         {
           "type": "CHOICE",
@@ -2378,8 +2390,11 @@
           "value": "otherwise"
         },
         {
-          "type": "SYMBOL",
-          "name": "_end_of_line"
+          "type": "REPEAT",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_end_of_line"
+          }
         },
         {
           "type": "CHOICE",
@@ -2411,8 +2426,11 @@
           }
         },
         {
-          "type": "SYMBOL",
-          "name": "_end_of_line"
+          "type": "REPEAT",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_end_of_line"
+          }
         },
         {
           "type": "REPEAT",
@@ -3686,8 +3704,11 @@
           ]
         },
         {
-          "type": "SYMBOL",
-          "name": "_end_of_line"
+          "type": "REPEAT1",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_end_of_line"
+          }
         },
         {
           "type": "CHOICE",
@@ -3711,16 +3732,11 @@
           "value": "try"
         },
         {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "_end_of_line"
-            },
-            {
-              "type": "BLANK"
-            }
-          ]
+          "type": "REPEAT",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_end_of_line"
+          }
         },
         {
           "type": "CHOICE",