twin/ripgrep
1
0
Fork 0
mirror of https://github.com/BurntSushi/ripgrep.git synced 2025-08-11 18:21:58 -07:00
Code Issues Packages Projects Releases Wiki Activity

printer: trim line terminator before finding submatches

Browse Source 
This fixes a bug where PCRE2 look-around could change the result of a
match if it observed a line terminator in the printer. And in
particular, this is precisely how the searcher operates: the line is
considered unto itself *without* the line terminator.

Fixes #1401
This commit is contained in:
Andrew Gallant
2021-05-31 19:00:56 -04:00
parent efd9cfb2fc
commit ee23ab5173
4 changed files with 55 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
crates/printer/src/standard.rs
View File

@@ -17,7 +17,8 @@ use color::ColorSpecs;
use counter::CounterWriter;
use stats::Stats;
use util::{
find_iter_at_in_context, trim_ascii_prefix, PrinterPath, Replacer, Sunk,
find_iter_at_in_context, trim_ascii_prefix, trim_line_terminator,
PrinterPath, Replacer, Sunk,
};
/// The configuration for the standard printer.
@@ -1547,17 +1548,7 @@ impl<'a, M: Matcher, W: WriteColor> StandardImpl<'a, M, W> {
}
fn trim_line_terminator(&self, buf: &[u8], line: &mut Match) {
let lineterm = self.searcher.line_terminator();
if lineterm.is_suffix(&buf[*line]) {
let mut end = line.end() - 1;
if lineterm.is_crlf()
&& end > 0
&& buf.get(end - 1) == Some(&b'\r')
{
end -= 1;
}
*line = line.with_end(end);
}
trim_line_terminator(&self.searcher, buf, line);
}
fn has_line_terminator(&self, buf: &[u8]) -> bool {