rust/ripgrep
1
0
Fork 0
mirror of https://github.com/BurntSushi/ripgrep.git synced 2025-04-19 09:02:15 +02:00
Code Issues Releases Activity

No line numbers when searching only stdin.

Browse Source 
This changes the default behavior of ripgrep to *not* show line numbers
when it is printing to a tty and is only searching stdin.

Fixes #380

[breaking-change]
This commit is contained in:
Andrew Gallant 2017-03-12 20:21:38 -04:00
parent 8db24e1353
commit 4ef4818130
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/args.rs
View File

@ -319,6 +319,7 @@ impl<'a> ArgMatches<'a> {
/// configuration. /// configuration.
fn to_args(&self) -> Result<Args> { fn to_args(&self) -> Result<Args> {
let paths = self.paths(); let paths = self.paths();
let line_number = self.line_number(&paths);
let mmap = try!(self.mmap(&paths)); let mmap = try!(self.mmap(&paths));
let with_filename = self.with_filename(&paths); let with_filename = self.with_filename(&paths);
let (before_context, after_context) = try!(self.contexts()); let (before_context, after_context) = try!(self.contexts());
@ -345,7 +346,7 @@ impl<'a> ArgMatches<'a> {
hidden: self.hidden(), hidden: self.hidden(),
ignore_files: self.ignore_files(), ignore_files: self.ignore_files(),
invert_match: self.is_present("invert-match"), invert_match: self.is_present("invert-match"),
line_number: self.line_number(), line_number: line_number,
line_per_match: self.is_present("vimgrep"), line_per_match: self.is_present("vimgrep"),
max_count: try!(self.usize_of("max-count")).map(|max| max as u64), max_count: try!(self.usize_of("max-count")).map(|max| max as u64),
max_filesize: try!(self.max_filesize()), max_filesize: try!(self.max_filesize()),
@ -593,13 +594,14 @@ impl<'a> ArgMatches<'a> {
} }
/// Returns true if and only if line numbers should be shown. /// Returns true if and only if line numbers should be shown.
fn line_number(&self) -> bool { fn line_number(&self, paths: &[PathBuf]) -> bool {
if self.is_present("no-line-number") || self.is_present("count") { if self.is_present("no-line-number") || self.is_present("count") {
false false
} else { } else {
let only_stdin = paths == &[Path::new("-")];
self.is_present("line-number") self.is_present("line-number")
|| self.is_present("column") || self.is_present("column")
|| atty::is(atty::Stream::Stdout) || (atty::is(atty::Stream::Stdout) && !only_stdin)
|| self.is_present("pretty") || self.is_present("pretty")
|| self.is_present("vimgrep") || self.is_present("vimgrep")
} }