lostecho/ripgrep
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

ripgrep: max-column-preview --> max-columns-preview

Browse Source 
Credit to @okdana for catching this. This naming is a bit more
consistent with the existing --max-columns flag.
This commit is contained in:
Andrew Gallant
2019-04-15 06:51:51 -04:00
parent 45d12abbc5
commit ef1611b5f5
7 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/app.rs
View File

@@ -583,7 +583,7 @@ pub fn all_args_and_flags() -> Vec<RGArg> {
flag_line_number(&mut args);
flag_line_regexp(&mut args);
flag_max_columns(&mut args);
flag_max_column_preview(&mut args);
flag_max_columns_preview(&mut args);
flag_max_count(&mut args);
flag_max_depth(&mut args);
flag_max_filesize(&mut args);
@@ -1490,7 +1490,7 @@ When this flag is omitted or is set to 0, then it has no effect.
args.push(arg);
}
fn flag_max_column_preview(args: &mut Vec<RGArg>) {
fn flag_max_columns_preview(args: &mut Vec<RGArg>) {
const SHORT: &str = "Print a preview for lines exceeding the limit.";
const LONG: &str = long!("\
When the '--max-columns' flag is used, ripgrep will by default completely
@@ -1501,16 +1501,16 @@ of the line exceeding the limit is not shown.
If the '--max-columns' flag is not set, then this has no effect.
This flag can be disabled with '--no-max-column-preview'.
This flag can be disabled with '--no-max-columns-preview'.
");
let arg = RGArg::switch("max-column-preview")
let arg = RGArg::switch("max-columns-preview")
.help(SHORT).long_help(LONG)
.overrides("no-max-column-preview");
.overrides("no-max-columns-preview");
args.push(arg);
let arg = RGArg::switch("no-max-column-preview")
let arg = RGArg::switch("no-max-columns-preview")
.hidden()
.overrides("max-column-preview");
.overrides("max-columns-preview");
args.push(arg);
}

6
src/args.rs
View File

@@ -778,7 +778,7 @@ impl ArgMatches {
.per_match(self.is_present("vimgrep"))
.replacement(self.replacement())
.max_columns(self.max_columns()?)
.max_column_preview(self.max_column_preview())
.max_columns_preview(self.max_columns_preview())
.max_matches(self.max_count()?)
.column(self.column())
.byte_offset(self.is_present("byte-offset"))
@@ -1177,8 +1177,8 @@ impl ArgMatches {
/// Returns true if and only if a preview should be shown for lines that
/// exceed the maximum column limit.
fn max_column_preview(&self) -> bool {
self.is_present("max-column-preview")
fn max_columns_preview(&self) -> bool {
self.is_present("max-columns-preview")
}
/// The maximum number of matches permitted.