From af44a47271611d06afbc51361b6cb50426f55e28 Mon Sep 17 00:00:00 2001 From: Valentin Krasontovitsch Date: Wed, 25 Feb 2026 13:57:40 +0100 Subject: [PATCH] fix(dockerfile): remove injection.combined from shell_fragment bash injection injection.combined merges shell_fragment nodes from ALL RUN commands into a single bash parse tree. The bash parser receives fragments from different RUN blocks adjacently (no separator bytes between them), causing it to parse the tail of one RUN command and the head of the next as a single command node. This makes arguments in subsequent RUN commands receive @variable.parameter highlights, causing visible color bleed. Fix: remove injection.combined so each shell_fragment gets its own bash tree. Continuation lines ending in && produce has_error=true trees, but this is harmless for highlighting in practice. Fixes #6530, #7013, #7062, #6975, #5605 --- runtime/queries/dockerfile/injections.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/runtime/queries/dockerfile/injections.scm b/runtime/queries/dockerfile/injections.scm index 5d3bbffb7..445238027 100644 --- a/runtime/queries/dockerfile/injections.scm +++ b/runtime/queries/dockerfile/injections.scm @@ -4,7 +4,6 @@ ((shell_command (shell_fragment) @injection.content) (#set! injection.language "bash") - (#set! injection.combined)) ((run_instruction (heredoc_block) @injection.content)