mirror of
https://github.com/nushell/nushell.git
synced 2024-11-22 16:33:37 +01:00
To nuon escapes (#6660)
* Add tests for "to nuon" escaping handling * Fix "to nuon" not escaping double quotations * Fix "to nuon" double backslash Fix value_to_string_without_quotes leaving escaped backslash in non-quoted strings
This commit is contained in:
parent
5921c19bc0
commit
79ce13abef
@ -173,12 +173,11 @@ fn value_to_string(v: &Value, span: Span) -> Result<String, ShellError> {
|
||||
fn value_to_string_without_quotes(v: &Value, span: Span) -> Result<String, ShellError> {
|
||||
match v {
|
||||
Value::String { val, .. } => Ok({
|
||||
let mut quoted = escape_quote_string(val);
|
||||
if !needs_quotes(val) {
|
||||
quoted.remove(0);
|
||||
quoted.pop();
|
||||
if needs_quotes(val) {
|
||||
escape_quote_string(val)
|
||||
} else {
|
||||
val.clone()
|
||||
}
|
||||
quoted
|
||||
}),
|
||||
_ => value_to_string(v, span),
|
||||
}
|
||||
@ -209,6 +208,7 @@ fn needs_quotes(string: &str) -> bool {
|
||||
|| string.contains('\t')
|
||||
|| string.contains('\n')
|
||||
|| string.contains('\r')
|
||||
|| string.contains('\"')
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
|
@ -103,6 +103,51 @@ fn to_nuon_escaping2() {
|
||||
assert_eq!(actual.out, "hello\\world");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn to_nuon_escaping3() {
|
||||
let actual = nu!(
|
||||
cwd: "tests/fixtures/formats", pipeline(
|
||||
r#"
|
||||
["hello\\world"]
|
||||
| to nuon
|
||||
| from nuon
|
||||
| $in == [hello\world]
|
||||
"#
|
||||
));
|
||||
|
||||
assert_eq!(actual.out, "true");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn to_nuon_escaping4() {
|
||||
let actual = nu!(
|
||||
cwd: "tests/fixtures/formats", pipeline(
|
||||
r#"
|
||||
["hello\"world"]
|
||||
| to nuon
|
||||
| from nuon
|
||||
| $in == ["hello\"world"]
|
||||
"#
|
||||
));
|
||||
|
||||
assert_eq!(actual.out, "true");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn to_nuon_escaping5() {
|
||||
let actual = nu!(
|
||||
cwd: "tests/fixtures/formats", pipeline(
|
||||
r#"
|
||||
{s: "hello\"world"}
|
||||
| to nuon
|
||||
| from nuon
|
||||
| $in == {s: "hello\"world"}
|
||||
"#
|
||||
));
|
||||
|
||||
assert_eq!(actual.out, "true");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn to_nuon_negative_int() {
|
||||
let actual = nu!(
|
||||
|
Loading…
Reference in New Issue
Block a user