This will also break Dockerfiles that contain the escape directive, for example

# escape=%
FROM scratch
RUN ls %
  --tree

Here the content below shell_command can't be treated as one script. It is interspersed by the Dockerfile line_continuation.

None of the existing injection types are completely correct here. include-children is wrong, because it includes the Dockerfile line_continuations in the script. And combined is wrong, because it treats all RUN statements as one large script.

But I think treating it as one large script is the less bad alternative (if it were to work as intended and didn't have the bug I reported).

This will also break Dockerfiles that contain the escape directive, for example

Great point 👍 Though this also doesn't seem to be parsed correctly by dockerfile parser alone, without any injections. From what I see it just seems to stop parsing after %.

And it's a known issue camdencheek/tree-sitter-dockerfile#2

Just read a bit more about docker heredocs (never used them myself). They can be used to supply the whole script, but also they can be in the middle of a command like in normal shell scripts. Which means it's not quite right to always inject bash in heredocs, but we have no way to separate those cases. With heredocs in the middle of a command it would be ok to use include-children it seems, but on a shell_fragment, not shell_command.