Skip to content

Commit b42c824

Browse files
committed
vweb: simplify @foo by removing V_TEMPLATE rule
1 parent f0d4641 commit b42c824

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

vlib/v/parser/tmpl.v

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -287,13 +287,13 @@ fn vweb_tmpl_${fn_name}() string {
287287
}
288288
}
289289
.js {
290-
if line.contains('//V_TEMPLATE') {
291-
source.writeln(insert_template_code(fn_name, tmpl_str_start, line))
292-
} else {
293-
// replace `$` to `\$` at first to escape JavaScript template literal syntax
294-
source.writeln(line.replace(r'$', r'\$').replace(r'$$', r'@').replace(r'.$',
295-
r'.@').replace(r"'", r"\'"))
296-
}
290+
// if line.contains('//V_TEMPLATE') {
291+
source.writeln(insert_template_code(fn_name, tmpl_str_start, line))
292+
//} else {
293+
// replace `$` to `\$` at first to escape JavaScript template literal syntax
294+
// source.writeln(line.replace(r'$', r'\$').replace(r'$$', r'@').replace(r'.$',
295+
// r'.@').replace(r"'", r"\'"))
296+
//}
297297
continue
298298
}
299299
.css {

vlib/v/tests/tmpl_script_tag_interpolation_test.v

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ fn test_template_interpolation_can_be_selectively_turned_on_in_script_tags() {
2020
text := $tmpl('tmpl/selective_interpolation_in_script_tag.html')
2121
dump(text)
2222
assert text.contains('Username: abcd')
23-
assert text.contains('var non_interpolated_labels = @benchmark_plot_data.dates;')
24-
assert text.contains('var non_interpolated_values = @benchmark_plot_data.numerical_result;')
23+
assert text.contains('var non_interpolated_labels = ['2012-11-30', '2022-12-29'];')
24+
assert text.contains('var non_interpolated_values = [5, 6, 7, 1];')
2525
assert text.contains("var real_labels = ['2012-11-30', '2022-12-29']; //V_TEMPLATE")
2626
assert text.contains('var real_values = [5, 6, 7, 1]; //V_TEMPLATE')
2727
assert text.contains('Year: 2022')

0 commit comments

Comments
 (0)