rust/ripgrep
1
0
Fork 0
mirror of https://github.com/BurntSushi/ripgrep.git synced 2025-02-14 22:23:24 +02:00
Code Issues Releases Activity

Fix an off-by-one error with --column.

Browse Source 
Fixes #105.
This commit is contained in:
Andrew Gallant 2016-09-26 19:09:59 -04:00
parent ebabe1df6a
commit d306403440
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/printer.rs
View File

@ -186,7 +186,7 @@ impl<W: Terminal + Send> Printer<W> {
let column = let column =
if self.column { if self.column {
Some(re.find(&buf[start..end]) Some(re.find(&buf[start..end])
.map(|(s, _)| s + 1).unwrap_or(0) as u64) .map(|(s, _)| s).unwrap_or(0) as u64)
} else { } else {
None None
}; };

22
tests/tests.rs
View File

@ -86,8 +86,8 @@ sherlock!(columns, |wd: WorkDir, mut cmd: Command| {
cmd.arg("--column"); cmd.arg("--column");
let lines: String = wd.stdout(&mut cmd); let lines: String = wd.stdout(&mut cmd);
let expected = "\ let expected = "\
58:For the Doctor Watsons of this world, as opposed to the Sherlock 57:For the Doctor Watsons of this world, as opposed to the Sherlock
50:be, to a very large extent, the result of luck. Sherlock Holmes 49:be, to a very large extent, the result of luck. Sherlock Holmes
"; ";
assert_eq!(lines, expected); assert_eq!(lines, expected);
}); });
@ -716,6 +716,24 @@ clean!(regression_93, r"(\d{1,3}\.){3}\d{1,3}", ".",
assert_eq!(lines, "foo:192.168.1.1\n"); assert_eq!(lines, "foo:192.168.1.1\n");
}); });
// See: https://github.com/BurntSushi/ripgrep/issues/105
clean!(regression_105_part1, "test", ".", |wd: WorkDir, mut cmd: Command| {
wd.create("foo", "zztest");
cmd.arg("--vimgrep");
let lines: String = wd.stdout(&mut cmd);
assert_eq!(lines, "foo:1:3:zztest\n");
});
// See: https://github.com/BurntSushi/ripgrep/issues/105
clean!(regression_105_part2, "test", ".", |wd: WorkDir, mut cmd: Command| {
wd.create("foo", "zztest");
cmd.arg("--column");
let lines: String = wd.stdout(&mut cmd);
assert_eq!(lines, "foo:3:zztest\n");
});
// See: https://github.com/BurntSushi/ripgrep/issues/20 // See: https://github.com/BurntSushi/ripgrep/issues/20
sherlock!(feature_20, "Sherlock", ".", |wd: WorkDir, mut cmd: Command| { sherlock!(feature_20, "Sherlock", ".", |wd: WorkDir, mut cmd: Command| {
cmd.arg("--no-filename"); cmd.arg("--no-filename");