Merge b760eef0ba into 4916d6592e

runtime/queries/dockerfile/injections.scm

@@ -1,10 +1,10 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
 
-((shell_command
+((run_instruction
-  (shell_fragment) @injection.content)
+  (shell_command) @injection.content)
   (#set! injection.language "bash")
-  (#set! injection.combined))
+  (#set! injection.include-children))
 
 ((run_instruction
   (heredoc_block) @injection.content)

tests/query/highlights/dockerfile/bash-bleed-across-runs-regression.dockerfile

@@ -0,0 +1,21 @@
+FROM python AS base
+# <- @keyword
+
+RUN pip install requests && \
+# <- @keyword
+#     ^^^ @function.call
+#         ^^^ @variable.parameter
+  echo all done
+# ^^^^ @function.call
+
+FROM alpine
+# <- @keyword
+# <- @!variable.parameter
+
+RUN apk add openssh-client
+# <- @keyword
+#     ^^^ @function.call
+
+CMD ["/usr/bin/sh"]
+# <- @keyword
+# <- @!variable.parameter

tests/query/injections/dockerfile/bash-on-run-instructions.dockerfile

@@ -1,6 +1,11 @@
 FROM foo
 RUN bar
 #   ^ @bash
+FROM haha
+#     ^ @!bash
 RUN \
   baz
 # ^ @bash
+
+COPY apt apt
+#     ^ @!bash