Add !shebang to injection queries to improve match precedence

grammar.js

@@ -280,7 +280,7 @@ module.exports = grammar({
     recipe_body: ($) =>
       seq(
         $._indent,
-        optional(seq($.shebang, $._newline)),
+        optional(seq(field("shebang", $.shebang), $._newline)),
         repeat(choice(seq($.recipe_line, $._newline), $._newline)),
         $._dedent,
       ),
@@ -293,6 +293,7 @@ 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 with a nested `language` token that we can extract

queries-flavored/helix/injections.scm

@@ -18,6 +18,7 @@
 
 ; Default everything to be bash
 (recipe_body
+  !shebang
   (#set! injection.language "bash")
   (#set! injection.include-children)) @injection.content
 
@@ -50,7 +51,9 @@
     (#set! injection.language "powershell"))
   [
     (recipe
-      (recipe_body (#set! injection.include-children)) @injection.content)
+      (recipe_body
+        !shebang
+        (#set! injection.include-children)) @injection.content)
 
     (assignment
       (expression
@@ -65,7 +68,8 @@
   [
     (recipe
       (recipe_body
-      (#set! injection.include-children)) @injection.content)
+        !shebang
+        (#set! injection.include-children)) @injection.content)
 
     (assignment
       (expression

queries-flavored/lapce/injections.scm

@@ -18,6 +18,7 @@
 
 ; Default everything to be bash
 (recipe_body
+  !shebang
   (#set! injection.language "bash")
   (#set! injection.include-children)) @injection.content
 
@@ -50,7 +51,9 @@
     (#set! injection.language "powershell"))
   [
     (recipe
-      (recipe_body (#set! injection.include-children)) @injection.content)
+      (recipe_body
+        !shebang
+        (#set! injection.include-children)) @injection.content)
 
     (assignment
       (expression
@@ -65,7 +68,8 @@
   [
     (recipe
       (recipe_body
-      (#set! injection.include-children)) @injection.content)
+        !shebang
+        (#set! injection.include-children)) @injection.content)
 
     (assignment
       (expression
@@ -79,7 +83,7 @@
 ; Set highlighting for recipes that specify a language, using the exact name by default
 (recipe_body ;
   (shebang ;
-    (language) @injection.language) ;
+    (language) @injection.language)
   (#not-any-of? @injection.language "python3" "nodejs" "node")
   (#set! injection.include-children)) @injection.content
 

queries-flavored/nvim-next/injections.scm

@@ -16,6 +16,7 @@
 
 ; Default everything to be bash
 (recipe_body
+  !shebang
   (#set! injection.language "bash")
   (#set! injection.include-children)) @injection.content
 
@@ -48,7 +49,9 @@
     (#set! injection.language "powershell"))
   [
     (recipe
-      (recipe_body (#set! injection.include-children)) @injection.content)
+      (recipe_body
+        !shebang
+        (#set! injection.include-children)) @injection.content)
 
     (assignment
       (expression
@@ -63,7 +66,8 @@
   [
     (recipe
       (recipe_body
-      (#set! injection.include-children)) @injection.content)
+        !shebang
+        (#set! injection.include-children)) @injection.content)
 
     (assignment
       (expression
@@ -77,7 +81,7 @@
 ; Set highlighting for recipes that specify a language, using the exact name by default
 (recipe_body ;
   (shebang ;
-    (language) @injection.language) ;
+    (language) @injection.language)
   (#not-any-of? @injection.language "python3" "nodejs" "node")
   (#set! injection.include-children)) @injection.content
 

queries-flavored/zed/injections.scm

@@ -18,6 +18,7 @@
 
 ; Default everything to be bash
 (recipe_body
+  !shebang
   (#set! injection.language "bash")
   (#set! injection.include-children)) @injection.content
 
@@ -50,7 +51,9 @@
     (#set! injection.language "powershell"))
   [
     (recipe
-      (recipe_body (#set! injection.include-children)) @injection.content)
+      (recipe_body
+        !shebang
+        (#set! injection.include-children)) @injection.content)
 
     (assignment
       (expression
@@ -65,7 +68,8 @@
   [
     (recipe
       (recipe_body
-      (#set! injection.include-children)) @injection.content)
+        !shebang
+        (#set! injection.include-children)) @injection.content)
 
     (assignment
       (expression
@@ -79,7 +83,7 @@
 ; Set highlighting for recipes that specify a language, using the exact name by default
 (recipe_body ;
   (shebang ;
-    (language) @injection.language) ;
+    (language) @injection.language)
   (#not-any-of? @injection.language "python3" "nodejs" "node")
   (#set! injection.include-children)) @injection.content
 

queries-src/injections.scm

@@ -16,6 +16,7 @@
 
 ; Default everything to be bash
 (recipe_body
+  !shebang
   (#set! injection.language "bash")
   (#set! injection.include-children)) @injection.content
 
@@ -48,7 +49,9 @@
     (#set! injection.language "powershell"))
   [
     (recipe
-      (recipe_body (#set! injection.include-children)) @injection.content)
+      (recipe_body
+        !shebang
+        (#set! injection.include-children)) @injection.content)
 
     (assignment
       (expression
@@ -63,7 +66,8 @@
   [
     (recipe
       (recipe_body
-      (#set! injection.include-children)) @injection.content)
+        !shebang
+        (#set! injection.include-children)) @injection.content)
 
     (assignment
       (expression
@@ -77,7 +81,7 @@
 ; Set highlighting for recipes that specify a language, using the exact name by default ; SKIP-HELIX
 (recipe_body ;                                                                          ; SKIP-HELIX
   (shebang ;                                                                            ; SKIP-HELIX
-    (language) @injection.language) ;                                                   ; SKIP-HELIX
+    (language) @injection.language)                                                     ; SKIP-HELIX
   (#not-any-of? @injection.language "python3" "nodejs" "node")                          ; SKIP-HELIX
   (#set! injection.include-children)) @injection.content                                ; SKIP-HELIX
                                                                                         ; SKIP-HELIX

queries/just/injections.scm

@@ -16,6 +16,7 @@
 
 ; Default everything to be bash
 (recipe_body
+  !shebang
   (#set! injection.language "bash")
   (#set! injection.include-children)) @injection.content
 
@@ -48,7 +49,9 @@
     (#set! injection.language "powershell"))
   [
     (recipe
-      (recipe_body (#set! injection.include-children)) @injection.content)
+      (recipe_body
+        !shebang
+        (#set! injection.include-children)) @injection.content)
 
     (assignment
       (expression
@@ -63,7 +66,8 @@
   [
     (recipe
       (recipe_body
-      (#set! injection.include-children)) @injection.content)
+        !shebang
+        (#set! injection.include-children)) @injection.content)
 
     (assignment
       (expression
@@ -77,7 +81,7 @@
 ; Set highlighting for recipes that specify a language, using the exact name by default
 (recipe_body ;
   (shebang ;
-    (language) @injection.language) ;
+    (language) @injection.language)
   (#not-any-of? @injection.language "python3" "nodejs" "node")
   (#set! injection.include-children)) @injection.content