Fixups

tgross35 · Jan 7, 2024 · 19842cc · 19842cc
1 parent 49f7a5b
commit 19842cc
Show file tree

Hide file tree

Showing 3 changed files with 3,435 additions and 3,388 deletions.
diff --git a/grammar.js b/grammar.js
@@ -298,26 +298,27 @@ module.exports = grammar({
     recipe_line_prefix: (_) => choice("@-", "-@", "@", "-"),
 
     shebang: ($) =>
-      prec(
-        4,
-        seq(
-          // token.immediate(
-          //   /\s*#!.*/,
-          //   choice(
-          //     prec(
-          //       2,
-          //       token.immediate(
-          //         $.shebang_language,
-          //         // seq(/\S*bin\S*[/ ]/, $.shebang_language, optional(/.+/)),
-          //       ),
-          //     ),
-          //     // /.*/,
-          //   ),
-          // ),
-          /#!.*/,
-          $._newline,
-        ),
-      ),
+      prec.left(10, seq(token.immediate(/#!/, /.*/), optional($._newline))),
+    // prec(
+    //   4,
+    //   seq(
+    //     // token.immediate(
+    //     //   /\s*#!.*/,
+    //     //   choice(
+    //     //     prec(
+    //     //       2,
+    //     //       token.immediate(
+    //     //         $.shebang_language,
+    //     //         // seq(/\S*bin\S*[/ ]/, $.shebang_language, optional(/.+/)),
+    //     //       ),
+    //     //     ),
+    //     //     // /.*/,
+    //     //   ),
+    //     // ),
+    //     /#!.*/,
+    //     $._newline,
+    //   ),
+    // ),
 
     shebang_language: ($) => /.+/,
     ///\S+/,

diff --git a/src/grammar.json b/src/grammar.json
@@ -1252,18 +1252,29 @@
       ]
     },
     "shebang": {
-      "type": "PREC",
-      "value": 4,
+      "type": "PREC_LEFT",
+      "value": 10,
       "content": {
         "type": "SEQ",
         "members": [
           {
-            "type": "PATTERN",
-            "value": "#!.*"
+            "type": "IMMEDIATE_TOKEN",
+            "content": {
+              "type": "PATTERN",
+              "value": "#!"
+            }
           },
           {
-            "type": "SYMBOL",
-            "name": "_newline"
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "_newline"
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
           }
         ]
       }