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