Improved $-escape handling in interpolation

tecosaur · Feb 19, 2024 · 3e2bd98 · 3e2bd98
1 parent 8c76e73
commit 3e2bd98
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/parser.jl b/src/parser.jl
@@ -112,6 +112,8 @@ function interpolate(value::String, dotenv::Dict{String, String}, fallback::Abst
         point = nextind(value, point)
         if escaped
             escaped = false
+            value[point] == '$' || write(interpval, '\\')
+            write(interpval, value[point])
             continue
         elseif value[point] == '\\'
             escaped = true

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -51,8 +51,12 @@ end
 
 @testset "Interpolation" begin
     @test interpolate("hello", Dict{String, String}(), ENV) == "hello"
+    @test interpolate("hi\$there", Dict{String, String}(), ENV) == "hi"
+    @test interpolate("hi\\\$there", Dict{String, String}(), ENV) == "hi\$there"
+    @test interpolate("hi\\0there", Dict{String, String}(), ENV) == "hi\\0there"
     @test interpolate("hello \$USER", Dict{String, String}(), ENV) == "hello $the_user"
     @test interpolate("hello \$USER", Dict{String, String}("USER" => "fred"), ENV) == "hello fred"
+    @test interpolate("hello \${USER:-alice}", Dict{String, String}("USER" => "fred"), ENV) == "hello fred"
     @test interpolate("hello \${USER}", Dict{String, String}(), ENV) == "hello $the_user"
     @test interpolate("hello \$USER.", Dict{String, String}(), ENV) == "hello $the_user."
     @test interpolate("hello \$USERR", Dict{String, String}(), ENV) == "hello "