mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

fmt: fix wrong processing of quotes, when formatting string literals (fix #16017) (#16018)

Browse Source
This commit is contained in:
shove 2022-10-11 02:19:34 +08:00 committed by GitHub
parent 8f3f717736
commit eebc82d83a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
vlib/v/fmt/fmt.v
View File

@ -2621,18 +2621,14 @@ pub fn (mut f Fmt) char_literal(node ast.CharLiteral) {
}
pub fn (mut f Fmt) string_literal(node ast.StringLiteral) {
use_double_quote := node.val.contains("'") && !node.val.contains('"')
quote := if node.val.contains("'") && !node.val.contains('"') { '"' } else { "'" }
if node.is_raw {
f.write('r')
} else if node.language == ast.Language.c {
f.write('c')
}
if node.is_raw {
if use_double_quote {
f.write('"$node.val"')
} else {
f.write("'$node.val'")
}
f.write('$quote$node.val$quote')
} else {
unescaped_val := node.val.replace('$fmt.bs$fmt.bs', '\x01').replace_each([
"$fmt.bs'",
@ -2640,13 +2636,8 @@ pub fn (mut f Fmt) string_literal(node ast.StringLiteral) {
'$fmt.bs"',
'"',
])
if use_double_quote {
s := unescaped_val.replace_each(['\x01', '$fmt.bs$fmt.bs', '"', '$fmt.bs"'])
f.write('"$s"')
} else {
s := unescaped_val.replace_each(['\x01', '$fmt.bs$fmt.bs', "'", "$fmt.bs'"])
f.write("'$s'")
}
s := unescaped_val.replace_each(['\x01', '$fmt.bs$fmt.bs', quote, '$fmt.bs$quote'])
f.write('$quote$s$quote')
}
}
@ -2673,7 +2664,14 @@ pub fn (mut f Fmt) string_inter_literal(node ast.StringInterLiteral) {
// work too different for the various exprs that are interpolated
f.write(quote)
for i, val in node.vals {
f.write(val)
unescaped_val := val.replace('$fmt.bs$fmt.bs', '\x01').replace_each([
"$fmt.bs'",
"'",
'$fmt.bs"',
'"',
])
s := unescaped_val.replace_each(['\x01', '$fmt.bs$fmt.bs', quote, '$fmt.bs$quote'])
f.write('$s')
if i >= node.exprs.len {
break
}

10
vlib/v/fmt/tests/string_quotes_expected.vv
View File

@ -8,3 +8,13 @@ fn main() {
println('I\'m out of idea "_"')
println('Definitely out ":\'("')
}
arr := ['a', 'b']
_ := "<font color=\\\"warning\\\">message</font>\\n>${arr.join('\\n>')}"
_ := "<font color=\\\"warning\\\">message</font>\\n>${arr.join('\\n>')}"
_ := '<font color=\\"warning\\">message</font>\\n>'
_ := '<font color=\\"warning\\">message</font>\\n>'
_ := 'values: ${arr.join('\\n')}'
_ := 'values: ${arr.join('\\n')}'
_ := 'values: ${arr.join('\\n')}'
_ := 'values: ${arr.join('\\n')}'

10
vlib/v/fmt/tests/string_quotes_input.vv
View File

@ -8,3 +8,13 @@ fn main() {
println('I\'m out of idea "_"')
println("Definitely out \":'(\"")
}
arr := ['a', 'b']
_ := '<font color=\\"warning\\">message</font>\\n>${arr.join('\\n>')}'
_ := "<font color=\\\"warning\\\">message</font>\\n>${arr.join('\\n>')}"
_ := '<font color=\\"warning\\">message</font>\\n>'
_ := "<font color=\\\"warning\\\">message</font>\\n>"
_ := 'values: ${arr.join('\\n')}'
_ := "values: ${arr.join('\\n')}"
_ := 'values: ${arr.join("\\n")}'
_ := "values: ${arr.join("\\n")}"