Improve support for command bodies

grammar.js

@@ -309,8 +309,10 @@ module.exports = grammar({
 
     escape_sequence: (_) => ESCAPE_SEQUENCE,
 
-    _backticked: (_) => seq("`", repeat(/./), "`"),
-    _indented_backticked: (_) => seq("```", repeat(/./), "```"),
+    _backticked: ($) => seq("`", optional($.command_body), "`"),
+    _indented_backticked: ($) => seq("```", optional($.command_body), "```"),
+
+    command_body: ($) => repeat1(choice($.interpolation, /./)),
 
     // interpolation : '{{' expression '}}'
     interpolation: ($) => seq("{{", $.expression, "}}"),

queries-src/highlights.scm

@@ -78,9 +78,11 @@
   "]"
   "("
   ")"
+  "{{"
+  "}}"
 ] @punctuation.bracket
 
-[ "{{" "}}" "`" ] @punctuation.special
+[ "`" "```"] @punctuation.special
 
 ; Literals
 

queries-src/injections.scm

@@ -1,15 +1,12 @@
-(comment) @comment
+((comment) @injection.content
+  (#set! injection.language "comment"))
 
-; FIXME: shebang
-; (shebang_recipe 
-;     (shebang 
-;         interpreter:(TEXT) @language)
-;     (shebang_body) @content
-; ) 
+; Defaults if language is not set elsewhere
 
-(source_file 
-    ; (item (setting lang:(identifier) @language))
-    (recipe (recipe_body) @content)
-) 
+; (recipe_line
+;   (text) @injection.content
+;   (#set! injection.language "bash"))
 
-; (interpolation (expression) @just)
+; (external_command
+;   (command_body) @injection.content
+;   (#set! injection.language "bash"))

queries/just/highlights.scm

@@ -82,7 +82,7 @@
   ")"
 ] @punctuation.bracket
 
-[ "{{" "}}" "`" ] @punctuation.special
+[ "{{" "}}" "`" "```"] @punctuation.special
 
 ; Literals
 

queries/just/injections.scm

@@ -1,17 +1,14 @@
 ; File autogenerated by build-queries-nvim.py; do not edit
 
-(comment) @comment
+((comment) @injection.content
+  (#set! injection.language "comment"))
 
-; FIXME: shebang
-; (shebang_recipe 
-;     (shebang 
-;         interpreter:(TEXT) @language)
-;     (shebang_body) @content
-; ) 
+; Defaults if language is not set elsewhere
 
-(source_file 
-    ; (item (setting lang:(identifier) @language))
-    (recipe (recipe_body) @content)
-) 
+; (recipe_line
+;   (text) @injection.content
+;   (#set! injection.language "bash"))
 
-; (interpolation (expression) @just)
+; (external_command
+;   (command_body) @injection.content
+;   (#set! injection.language "bash"))