From cc12e37e5bdc5467c9a06ab9b0887a97758f567f Mon Sep 17 00:00:00 2001 From: stefan Date: Wed, 28 Jan 2026 15:55:38 -0800 Subject: [PATCH] fix(nix): make all bash injections combined --- runtime/queries/nix/injections.scm | 12 ++++++++---- tests/query/injections/nix/test-nix-injections.nix | 3 ++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/runtime/queries/nix/injections.scm b/runtime/queries/nix/injections.scm index 718a9c1c5..c1593b91f 100644 --- a/runtime/queries/nix/injections.scm +++ b/runtime/queries/nix/injections.scm @@ -48,7 +48,8 @@ ((string_fragment) @injection.content (#set! injection.language "bash"))) ] - (#lua-match? @_path "^%a+Phase$")) + (#lua-match? @_path "^%a+Phase$") + (#set! injection.combined)) (binding attrpath: (attrpath @@ -61,7 +62,8 @@ ((string_fragment) @injection.content (#set! injection.language "bash"))) ] - (#lua-match? @_path "^pre%a+$")) + (#lua-match? @_path "^pre%a+$") + (#set! injection.combined)) (binding attrpath: (attrpath @@ -74,7 +76,8 @@ ((string_fragment) @injection.content (#set! injection.language "bash"))) ] - (#lua-match? @_path "^post%a+$")) + (#lua-match? @_path "^post%a+$") + (#set! injection.combined)) (binding attrpath: (attrpath @@ -87,7 +90,8 @@ ((string_fragment) @injection.content (#set! injection.language "bash"))) ] - (#lua-match? @_path "^script$")) + (#lua-match? @_path "^script$") + (#set! injection.combined)) (apply_expression function: (_) @_func diff --git a/tests/query/injections/nix/test-nix-injections.nix b/tests/query/injections/nix/test-nix-injections.nix index 7505398e6..f0907a901 100644 --- a/tests/query/injections/nix/test-nix-injections.nix +++ b/tests/query/injections/nix/test-nix-injections.nix @@ -9,7 +9,8 @@ in { drv1 = stdenv.mkDerivation { buildPhase = "mkdir $out"; installPhase = '' - echo "bar" > $out/foo.txt + echo "${bar}" > $out/foo.txt + echo "baz"" >> $out/foo.txt ''; };