Merge pull request #160 from alanpearce/shebang-spaces

Allow spaces after shebang
IndianBoy42 · May 2, 2024 · fd814fc · fd814fc
2 parents 72937dd + 2bf2bbd
commit fd814fc
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 16 deletions.
diff --git a/grammar.js b/grammar.js
@@ -294,7 +294,8 @@ module.exports = grammar({
     recipe_line_prefix: (_) => choice("@-", "-@", "@", "-"),
 
     // Any shebang. Needs a named field to apply injection queries correctly.
-    shebang: ($) => seq("#!", choice($._shebang_with_lang, $._opaque_shebang)),
+    shebang: ($) =>
+      seq(/#![ \t]*/, choice($._shebang_with_lang, $._opaque_shebang)),
 
     // Shebang with a nested `language` token that we can extract
     _shebang_with_lang: ($) =>

diff --git a/src/grammar.json b/src/grammar.json
diff --git a/src/node-types.json b/src/node-types.json
diff --git a/src/parser.c b/src/parser.c
diff --git a/test/corpus/recipes.txt b/test/corpus/recipes.txt
@@ -358,6 +358,37 @@ foo:
       (recipe_line
         (text)))))
 
+================================================================================
+shebang with spaces
+================================================================================
+
+foo:
+  #!  /bin/sh
+  if [ -f "foo" ]; then
+    echo "foo {{var}}"
+  fi
+
+--------------------------------------------------------------------------------
+
+(source_file
+  (recipe
+    (recipe_header
+      (identifier))
+    (recipe_body
+      (shebang
+        (language))
+      (recipe_line
+        (text))
+      (recipe_line
+        (text)
+        (interpolation
+          (expression
+            (value
+              (identifier))))
+        (text))
+      (recipe_line
+        (text)))))
+
 ================================================================================
 shebang with longer body
 ================================================================================

diff --git a/test/corpus/statements.txt b/test/corpus/statements.txt
@@ -492,6 +492,27 @@ foo:
 
 --------------------------------------------------------------------------------
 
+(source_file
+  (shebang
+    (language))
+  (recipe
+    (recipe_header
+      (identifier))
+    (recipe_body
+      (recipe_line
+        (text)))))
+
+================================================================================
+shebang with space
+================================================================================
+
+#! /usr/bin/env just
+
+foo:
+  body
+
+--------------------------------------------------------------------------------
+
 (source_file
   (shebang
     (language))