Split else_clause

Author: inaki-amatria

grammar.js

@@ -89,7 +89,6 @@ module.exports = grammar({
     [$.data_set, $._expression],
     [$.data_statement, $.identifier],
     [$.data_value, $._expression],
-    [$.else_clause],
     [$.elsewhere_clause],
     [$.intrinsic_type],
     [$._intrinsic_type, $.identifier],
@@ -104,6 +103,7 @@ module.exports = grammar({
     [$.coarray_critical_statement, $.identifier],
     [$.block_if_clause],
     [$.block_elseif_clause],
+    [$.block_else_clause],
   ],
 
   rules: {
@@ -1340,7 +1340,7 @@ module.exports = grammar({
     block_if_statement: $ => seq(
       $.block_if_clause,
       repeat($.block_elseif_clause),
-      optional($.else_clause),
+      optional($.block_else_clause),
       optional($.statement_label),
       $.end_if_statement
     ),
@@ -1377,11 +1377,15 @@ module.exports = grammar({
       optional($._block_label),
     ),
 
+    block_else_clause: $ => seq(
+      $.else_clause,
+      $.end_of_statement,
+      repeat($._statement),
+    ),
+
     else_clause: $ => seq(
       caseInsensitive('else'),
       optional($._block_label),
-      $.end_of_statement,
-      repeat($._statement)
     ),
 
     where_statement: $ => choice(

src/grammar.json

@@ -14679,7 +14679,7 @@
           "members": [
             {
               "type": "SYMBOL",
-              "name": "else_clause"
+              "name": "block_else_clause"
             },
             {
               "type": "BLANK"
@@ -14896,6 +14896,26 @@
         }
       ]
     },
+    "block_else_clause": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "else_clause"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "end_of_statement"
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_statement"
+          }
+        }
+      ]
+    },
     "else_clause": {
       "type": "SEQ",
       "members": [
@@ -14919,17 +14939,6 @@
               "type": "BLANK"
             }
           ]
-        },
-        {
-          "type": "SYMBOL",
-          "name": "end_of_statement"
-        },
-        {
-          "type": "REPEAT",
-          "content": {
-            "type": "SYMBOL",
-            "name": "_statement"
-          }
         }
       ]
     },
@@ -20753,9 +20762,6 @@
       "data_value",
       "_expression"
     ],
-    [
-      "else_clause"
-    ],
     [
       "elsewhere_clause"
     ],
@@ -20804,6 +20810,9 @@
     ],
     [
       "block_elseif_clause"
+    ],
+    [
+      "block_else_clause"
     ]
   ],
   "precedences": [],