parser: add back the escape for @ using @@ in $tmpl() templates, …

…add tests (the regression happened in 3115796 from 2024-09-22) (#22303)
vlang · Sep 25, 2024 · 1a4ad55 · 1a4ad55
1 parent e1900ae
commit 1a4ad55
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/vlib/v/parser/tmpl.v b/vlib/v/parser/tmpl.v
@@ -77,7 +77,7 @@ fn insert_template_code(fn_name string, tmpl_str_start string, line string) stri
 	// HTML, may include `@var`
 	// escaped by cgen, unless it's a `vweb.RawHtml` string
 	trailing_bs := tmpl_str_end + 'sb_${fn_name}.write_u8(92)\n' + tmpl_str_start
-	replace_pairs := ['\\', '\\\\', r"'", "\\'", r'@', r'$', r'$$', r'\@']
+	replace_pairs := ['\\', '\\\\', r"'", "\\'", r'@@', r'@', r'@', r'$', r'$$', r'\@']
 	mut rline := line.replace_each(replace_pairs)
 	comptime_call_str := rline.find_between('\${', '}')
 	if comptime_call_str.contains("\\'") {

diff --git a/vlib/v/tests/tmpl/escape.txt b/vlib/v/tests/tmpl/escape.txt
@@ -0,0 +1,3 @@
+Hello @@world
+Hello @world
+Hello @ @world @
diff --git a/vlib/v/tests/tmpl_escape_test.v b/vlib/v/tests/tmpl_escape_test.v
@@ -0,0 +1,9 @@
+fn test_escape() {
+	world := 'world!'
+	res := $tmpl('tmpl/escape.txt')
+
+	assert res == 'Hello @world
+Hello world!
+Hello $ world! $
+'
+}