git.delta.rocks / jrsonnet / refs/commits / 076f1febd13c

difftreelog

feat prefer to escape $ in singleline with \$

Yaroslav Bolyukin2021-10-01parent: #52a24f6.patch.diff
in: trunk

2 files changed

modifiedcrates/nixlike/src/lib.rsdiffbeforeafterboth
43		/ "\\n" { "\n" }43		/ "\\n" { "\n" }
44		/ "\\t" { "\t" }44		/ "\\t" { "\t" }
45		/ "\\r" { "\r" }45		/ "\\r" { "\r" }
46		/ "''$" { "$" }46		/ "\\$" { "$" }
47		/ c:$([_]) { c }47		/ c:$([_]) { c }
48	rule string() -> String48	rule string() -> String
49		= quiet! { "\"" v:(!"\"" c:string_char() {c})* "\"" { v.into_iter().collect() } } / expected!("<string>")49		= quiet! { "\"" v:(!"\"" c:string_char() {c})* "\"" { v.into_iter().collect() } } / expected!("<string>")
modifiedcrates/nixlike/src/to_string.rsdiffbeforeafterboth
--- a/crates/nixlike/src/to_string.rs
+++ b/crates/nixlike/src/to_string.rs
@@ -39,7 +39,7 @@
 				.replace('\n', "\\n")
 				.replace('\t', "\\t")
 				.replace('\r', "\\r")
-				.replace("$", "''$")
+				.replace("$", "\\$")
 		)),
 		Value::Array(a) => {
 			if a.is_empty() {