diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/json.rs | 17 | ||||
| -rw-r--r-- | tests/regression.rs | 9 |
2 files changed, 15 insertions, 11 deletions
diff --git a/tests/json.rs b/tests/json.rs index 477b36df..97d8e719 100644 --- a/tests/json.rs +++ b/tests/json.rs @@ -323,24 +323,19 @@ rgtest!(r1095_crlf_empty_match, |dir: Dir, mut cmd: TestCommand| { // Check without --crlf flag. let msgs = json_decode(&cmd.arg("-U").arg("--json").arg("\n").stdout()); - assert_eq!(msgs.len(), 5); + assert_eq!(msgs.len(), 4); let m = msgs[1].unwrap_match(); - assert_eq!(m.lines, Data::text("test\r\n")); - assert_eq!(m.submatches[0].m, Data::text("\n")); - - let m = msgs[2].unwrap_match(); - assert_eq!(m.lines, Data::text("\n")); + assert_eq!(m.lines, Data::text("test\r\n\n")); assert_eq!(m.submatches[0].m, Data::text("\n")); + assert_eq!(m.submatches[1].m, Data::text("\n")); // Now check with --crlf flag. let msgs = json_decode(&cmd.arg("--crlf").stdout()); + assert_eq!(msgs.len(), 4); let m = msgs[1].unwrap_match(); - assert_eq!(m.lines, Data::text("test\r\n")); - assert_eq!(m.submatches[0].m, Data::text("\n")); - - let m = msgs[2].unwrap_match(); - assert_eq!(m.lines, Data::text("\n")); + assert_eq!(m.lines, Data::text("test\r\n\n")); assert_eq!(m.submatches[0].m, Data::text("\n")); + assert_eq!(m.submatches[1].m, Data::text("\n")); }); diff --git a/tests/regression.rs b/tests/regression.rs index 203ac140..94e62969 100644 --- a/tests/regression.rs +++ b/tests/regression.rs @@ -744,6 +744,15 @@ rgtest!(r1259_drop_last_byte_nonl, |dir: Dir, mut cmd: TestCommand| { eqnice!("fz\n", cmd.arg("-f").arg("patterns-nl").arg("test").stdout()); }); +// See: https://github.com/BurntSushi/ripgrep/issues/1311 +rgtest!(r1311_multi_line_term_replace, |dir: Dir, mut cmd: TestCommand| { + dir.create("input", "hello\nworld\n"); + eqnice!( + "1:hello?world?\n", + cmd.args(&["-U", "-r?", "-n", "\n", "input"]).stdout() + ); +}); + // See: https://github.com/BurntSushi/ripgrep/issues/1319 rgtest!(r1319, |dir: Dir, mut cmd: TestCommand| { dir.create("input", "CCAGCTACTCGGGAGGCTGAGGCTGGAGGATCGCTTGAGTCCAGGAGTTC"); |