Allow include statements anywhere

Author: ZedThree

grammar.js

@@ -69,6 +69,7 @@ module.exports = grammar({
     /\s|\\\r?\n/,
     $.comment,
     '&',
+    $.include_statement,
   ],
 
   inline: $ => [
@@ -106,7 +107,6 @@ module.exports = grammar({
     ),
 
     _top_level_item: $ => prec(2, choice(
-      seq($.include_statement, $._end_of_statement),
       $.program,
       $.module,
       $.submodule,
@@ -508,7 +508,6 @@ module.exports = grammar({
       $.function,
       $.module_procedure,
       $.subroutine,
-      $.include_statement,
       alias($.preproc_if_in_internal_procedures, $.preproc_if),
       alias($.preproc_ifdef_in_internal_procedures, $.preproc_ifdef),
       $.preproc_include,
@@ -520,7 +519,6 @@ module.exports = grammar({
     // Variable Declarations
 
     _specification_part: $ => prec(1, choice(
-      prec(1, seq($.include_statement, $._end_of_statement)),
       seq($.use_statement, $._end_of_statement),
       seq($.implicit_statement, $._end_of_statement),
       seq($.save_statement, $._end_of_statement),
@@ -683,7 +681,6 @@ module.exports = grammar({
             alias(caseInsensitive('sequence'), $.sequence_statement),
             $._end_of_statement
         ),
-        seq($.include_statement, $._end_of_statement),
         seq($.variable_declaration, $._end_of_statement),
         $.preproc_include,
         $.preproc_def,
@@ -1044,7 +1041,6 @@ module.exports = grammar({
       $.call_expression,
       $.subroutine_call,
       $.keyword_statement,
-      $.include_statement,
       $.if_statement,
       $.arithmetic_if_statement,
       $.where_statement,
@@ -1146,7 +1142,8 @@ module.exports = grammar({
 
     include_statement: $ => seq(
       caseInsensitive('include'),
-      field("path", alias($.string_literal, $.filename))
+      field("path", alias($.string_literal, $.filename)),
+      $._end_of_statement,
     ),
 
     data_statement: $ => seq(

src/grammar.json

@@ -32,19 +32,6 @@
       "content": {
         "type": "CHOICE",
         "members": [
-          {
-            "type": "SEQ",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "include_statement"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "_end_of_statement"
-              }
-            ]
-          },
           {
             "type": "SYMBOL",
             "name": "program"
@@ -9069,10 +9056,6 @@
           "type": "SYMBOL",
           "name": "subroutine"
         },
-        {
-          "type": "SYMBOL",
-          "name": "include_statement"
-        },
         {
           "type": "ALIAS",
           "content": {
@@ -9115,23 +9098,6 @@
       "content": {
         "type": "CHOICE",
         "members": [
-          {
-            "type": "PREC",
-            "value": 1,
-            "content": {
-              "type": "SEQ",
-              "members": [
-                {
-                  "type": "SYMBOL",
-                  "name": "include_statement"
-                },
-                {
-                  "type": "SYMBOL",
-                  "name": "_end_of_statement"
-                }
-              ]
-            }
-          },
           {
             "type": "SEQ",
             "members": [
@@ -10443,19 +10409,6 @@
                   }
                 ]
               },
-              {
-                "type": "SEQ",
-                "members": [
-                  {
-                    "type": "SYMBOL",
-                    "name": "include_statement"
-                  },
-                  {
-                    "type": "SYMBOL",
-                    "name": "_end_of_statement"
-                  }
-                ]
-              },
               {
                 "type": "SEQ",
                 "members": [
@@ -12883,10 +12836,6 @@
           "type": "SYMBOL",
           "name": "keyword_statement"
         },
-        {
-          "type": "SYMBOL",
-          "name": "include_statement"
-        },
         {
           "type": "SYMBOL",
           "name": "if_statement"
@@ -13508,6 +13457,10 @@
             "named": true,
             "value": "filename"
           }
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_end_of_statement"
         }
       ]
     },
@@ -20731,6 +20684,10 @@
     {
       "type": "STRING",
       "value": "&"
+    },
+    {
+      "type": "SYMBOL",
+      "name": "include_statement"
     }
   ],
   "conflicts": [