cli: replace clap with lexopt and supporting code
ripgrep began it's life with docopt for argument parsing. Then it moved
to Clap and stayed there for a number of years. Clap has served ripgrep
well, and it probably could continue to serve ripgrep well, but I ended
up deciding to move off of it.
Why?
The first time I had the thought of moving off of Clap was during the
2->3->4 transition. I thought the 3.x and 4.x releases were great, but
for me, it ended up moving a little too quickly. Since the release of
4.x was telegraphed around when 3.x came out, I decided to just hold off
and wait to migrate to 4.x instead of doing a 3.x migration followed
shortly by another 4.x migration. Of course, I just never ended up doing
the migration at all. I never got around to it and there just wasn't a
compelling reason for me to upgrade. While I never investigated it, I
saw an upgrade as a non-trivial amount of work in part because I didn't
encapsulate the usage of Clap enough.
The above is just what got me started thinking about it. It wasn't
enough to get me to move off of it on its own. What ended up pushing me
over the edge was a combination of factors:
* As mentioned above, I didn't want to run on the migration treadmill.
This has proven to not be much of an issue, but at the time of the
2->3->4 releases, I didn't know how long Clap 4.x would be out before a
5.x would come out.
* The release of lexopt[1] caught my eye. IMO, that crate demonstrates
exactly how something new can arrive on the scene and just thoroughly
solve a problem minimalistically. It has the docs, the reasoning, the
simple API, the tests and good judgment. It gets all the weird corner
cases right that Clap also gets right (and is part of why I was
originally attracted to Clap).
* I have an overall desire to reduce the size of my dependency tree. In
part because a smaller dependency tree tends to correlate with better
compile times, but also in part because it reduces my reliance and trust
on others. It lets me be the "master" of ripgrep's destiny by reducing
the amount of behavior that is the result of someone else's decision
(whether good or bad).
* I perceived that Clap solves a more general problem than what I
actually need solved. Despite the vast number of flags that ripgrep has,
its requirements are actually pretty simple. We just need simple
switches and flags that support one value. No multi-value flags. No
sub-commands. And probably a lot of other functionality that Clap has
that makes it so flexible for so many different use cases. (I'm being
hand wavy on the last point.)
With all that said, perhaps most importantly, the future of ripgrep
possibly demands a more flexible CLI argument parser. In today's world,
I would really like, for example, flags like `--type` and `--type-not`
to be able to accumulate their repeated values into a single sequence
while respecting the order they appear on the CLI. For example, prior
to this migration, `rg regex-automata -Tlock -ttoml` would not return
results in `Cargo.lock` in this repository because the `-Tlock` always
took priority even though `-ttoml` appeared after it. But with this
migration, `-ttoml` now correctly overrides `-Tlock`. We would like to
do similar things for `-g/--glob` and `--iglob` and potentially even
now introduce a `-G/--glob-not` flag instead of requiring users to use
`!` to negate a glob. (Which I had done originally to work-around this
problem.) And some day, I'd like to add some kind of boolean matching to
ripgrep perhaps similar to how `git grep` does it. (Although I haven't
thought too carefully on a design yet.) In order to do that, I perceive
it would be difficult to implement correctly in Clap.
I believe that this last point is possible to implement correctly in
Clap 2.x, although it is awkward to do so. I have not looked closely
enough at the Clap 4.x API to know whether it's still possible there. In
any case, these were enough reasons to move off of Clap and own more of
the argument parsing process myself.
This did require a few things:
* I had to write my own logic for how arguments are combined into one
single state object. Of course, I wanted this. This was part of the
upside. But it's still code I didn't have to write for Clap.
* I had to write my own shell completion generator.
* I had to write my own `-h/--help` output generator.
* I also had to write my own man page generator. Well, I had to do this
with Clap 2.x too, although my understanding is that Clap 4.x supports
this. With that said, without having tried it, my guess is that I
probably wouldn't have liked the output it generated because I
ultimately had to write most of the roff by hand myself to get the man
page I wanted. (This also had the benefit of dropping the build
dependency on asciidoc/asciidoctor.)
While this is definitely a fair bit of extra work, it overall only cost
me a couple days. IMO, that's a good trade off given that this code is
unlikely to change again in any substantial way. And it should also
allow for more flexible semantics going forward.
Fixes #884, Fixes #1648, Fixes #1701, Fixes #1814, Fixes #1966
[1]: https://docs.rs/lexopt/0.3.0/lexopt/index.html
2023-10-17 00:05:39 +02:00
|
|
|
/*!
|
|
|
|
This module provides routines for reading ripgrep config "rc" files.
|
|
|
|
|
|
|
|
The primary output of these routines is a sequence of arguments, where each
|
|
|
|
argument corresponds precisely to one shell argument.
|
|
|
|
*/
|
2018-02-04 03:33:52 +02:00
|
|
|
|
2023-09-28 22:24:40 +02:00
|
|
|
use std::{
|
|
|
|
ffi::OsString,
|
|
|
|
path::{Path, PathBuf},
|
|
|
|
};
|
2018-02-04 03:33:52 +02:00
|
|
|
|
2019-06-26 22:47:33 +02:00
|
|
|
use bstr::{io::BufReadExt, ByteSlice};
|
2018-02-04 03:33:52 +02:00
|
|
|
|
|
|
|
/// Return a sequence of arguments derived from ripgrep rc configuration files.
|
2018-08-03 23:26:22 +02:00
|
|
|
pub fn args() -> Vec<OsString> {
|
2023-09-28 22:24:40 +02:00
|
|
|
let config_path = match std::env::var_os("RIPGREP_CONFIG_PATH") {
|
2018-02-04 03:33:52 +02:00
|
|
|
None => return vec![],
|
|
|
|
Some(config_path) => {
|
|
|
|
if config_path.is_empty() {
|
|
|
|
return vec![];
|
|
|
|
}
|
|
|
|
PathBuf::from(config_path)
|
|
|
|
}
|
|
|
|
};
|
|
|
|
let (args, errs) = match parse(&config_path) {
|
|
|
|
Ok((args, errs)) => (args, errs),
|
|
|
|
Err(err) => {
|
2021-11-15 17:29:34 +02:00
|
|
|
message!(
|
|
|
|
"failed to read the file specified in RIPGREP_CONFIG_PATH: {}",
|
|
|
|
err
|
|
|
|
);
|
2018-02-04 03:33:52 +02:00
|
|
|
return vec![];
|
|
|
|
}
|
|
|
|
};
|
2018-08-03 23:26:22 +02:00
|
|
|
if !errs.is_empty() {
|
2018-02-04 03:33:52 +02:00
|
|
|
for err in errs {
|
2018-08-03 23:26:22 +02:00
|
|
|
message!("{}:{}", config_path.display(), err);
|
2018-02-04 03:33:52 +02:00
|
|
|
}
|
|
|
|
}
|
2019-01-19 17:15:56 +02:00
|
|
|
log::debug!(
|
2018-02-04 03:33:52 +02:00
|
|
|
"{}: arguments loaded from config file: {:?}",
|
2018-08-03 23:26:22 +02:00
|
|
|
config_path.display(),
|
|
|
|
args
|
|
|
|
);
|
2018-02-04 03:33:52 +02:00
|
|
|
args
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Parse a single ripgrep rc file from the given path.
|
|
|
|
///
|
|
|
|
/// On success, this returns a set of shell arguments, in order, that should
|
|
|
|
/// be pre-pended to the arguments given to ripgrep at the command line.
|
|
|
|
///
|
|
|
|
/// If the file could not be read, then an error is returned. If there was
|
|
|
|
/// a problem parsing one or more lines in the file, then errors are returned
|
|
|
|
/// for each line in addition to successfully parsed arguments.
|
|
|
|
fn parse<P: AsRef<Path>>(
|
|
|
|
path: P,
|
2023-10-12 18:16:42 +02:00
|
|
|
) -> anyhow::Result<(Vec<OsString>, Vec<anyhow::Error>)> {
|
2018-02-04 03:33:52 +02:00
|
|
|
let path = path.as_ref();
|
2023-09-28 22:24:40 +02:00
|
|
|
match std::fs::File::open(&path) {
|
2018-02-04 03:33:52 +02:00
|
|
|
Ok(file) => parse_reader(file),
|
2023-10-12 18:16:42 +02:00
|
|
|
Err(err) => anyhow::bail!("{}: {}", path.display(), err),
|
2018-02-04 03:33:52 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Parse a single ripgrep rc file from the given reader.
|
|
|
|
///
|
|
|
|
/// Callers should not provided a buffered reader, as this routine will use its
|
|
|
|
/// own buffer internally.
|
|
|
|
///
|
|
|
|
/// On success, this returns a set of shell arguments, in order, that should
|
|
|
|
/// be pre-pended to the arguments given to ripgrep at the command line.
|
|
|
|
///
|
|
|
|
/// If the reader could not be read, then an error is returned. If there was a
|
|
|
|
/// problem parsing one or more lines, then errors are returned for each line
|
|
|
|
/// in addition to successfully parsed arguments.
|
2023-09-28 22:24:40 +02:00
|
|
|
fn parse_reader<R: std::io::Read>(
|
2018-02-04 03:33:52 +02:00
|
|
|
rdr: R,
|
2023-10-12 18:16:42 +02:00
|
|
|
) -> anyhow::Result<(Vec<OsString>, Vec<anyhow::Error>)> {
|
2023-09-28 22:24:40 +02:00
|
|
|
let mut bufrdr = std::io::BufReader::new(rdr);
|
2018-02-04 03:33:52 +02:00
|
|
|
let (mut args, mut errs) = (vec![], vec![]);
|
|
|
|
let mut line_number = 0;
|
2019-04-04 21:14:29 +02:00
|
|
|
bufrdr.for_byte_line_with_terminator(|line| {
|
2018-02-04 03:33:52 +02:00
|
|
|
line_number += 1;
|
2019-04-04 21:14:29 +02:00
|
|
|
|
|
|
|
let line = line.trim();
|
2018-02-04 03:33:52 +02:00
|
|
|
if line.is_empty() || line[0] == b'#' {
|
2019-04-04 21:14:29 +02:00
|
|
|
return Ok(true);
|
2018-02-04 03:33:52 +02:00
|
|
|
}
|
2019-04-04 21:14:29 +02:00
|
|
|
match line.to_os_str() {
|
2018-02-04 03:33:52 +02:00
|
|
|
Ok(osstr) => {
|
2019-04-04 21:14:29 +02:00
|
|
|
args.push(osstr.to_os_string());
|
2018-02-04 03:33:52 +02:00
|
|
|
}
|
|
|
|
Err(err) => {
|
2023-10-12 18:16:42 +02:00
|
|
|
errs.push(anyhow::anyhow!("{line_number}: {err}"));
|
2018-02-04 03:33:52 +02:00
|
|
|
}
|
|
|
|
}
|
2019-04-04 21:14:29 +02:00
|
|
|
Ok(true)
|
|
|
|
})?;
|
2018-02-04 03:33:52 +02:00
|
|
|
Ok((args, errs))
|
|
|
|
}
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
|
|
|
use super::parse_reader;
|
2020-02-18 01:08:47 +02:00
|
|
|
use std::ffi::OsString;
|
2018-02-04 03:33:52 +02:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn basic() {
|
2020-02-18 01:08:47 +02:00
|
|
|
let (args, errs) = parse_reader(
|
|
|
|
&b"\
|
2018-02-04 03:33:52 +02:00
|
|
|
# Test
|
|
|
|
--context=0
|
|
|
|
--smart-case
|
|
|
|
-u
|
|
|
|
|
|
|
|
|
|
|
|
# --bar
|
|
|
|
--foo
|
2020-02-18 01:08:47 +02:00
|
|
|
"[..],
|
|
|
|
)
|
|
|
|
.unwrap();
|
2018-02-04 03:33:52 +02:00
|
|
|
assert!(errs.is_empty());
|
|
|
|
let args: Vec<String> =
|
|
|
|
args.into_iter().map(|s| s.into_string().unwrap()).collect();
|
2020-02-18 01:08:47 +02:00
|
|
|
assert_eq!(args, vec!["--context=0", "--smart-case", "-u", "--foo",]);
|
2018-02-04 03:33:52 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// We test that we can handle invalid UTF-8 on Unix-like systems.
|
|
|
|
#[test]
|
|
|
|
#[cfg(unix)]
|
|
|
|
fn error() {
|
|
|
|
use std::os::unix::ffi::OsStringExt;
|
|
|
|
|
2020-02-18 01:08:47 +02:00
|
|
|
let (args, errs) = parse_reader(
|
|
|
|
&b"\
|
2018-02-04 03:33:52 +02:00
|
|
|
quux
|
|
|
|
foo\xFFbar
|
|
|
|
baz
|
2020-02-18 01:08:47 +02:00
|
|
|
"[..],
|
|
|
|
)
|
|
|
|
.unwrap();
|
2018-02-04 03:33:52 +02:00
|
|
|
assert!(errs.is_empty());
|
2020-02-18 01:08:47 +02:00
|
|
|
assert_eq!(
|
|
|
|
args,
|
|
|
|
vec![
|
|
|
|
OsString::from("quux"),
|
|
|
|
OsString::from_vec(b"foo\xFFbar".to_vec()),
|
|
|
|
OsString::from("baz"),
|
|
|
|
]
|
|
|
|
);
|
2018-02-04 03:33:52 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// ... but test that invalid UTF-8 fails on Windows.
|
|
|
|
#[test]
|
|
|
|
#[cfg(not(unix))]
|
|
|
|
fn error() {
|
2020-02-18 01:08:47 +02:00
|
|
|
let (args, errs) = parse_reader(
|
|
|
|
&b"\
|
2018-02-04 03:33:52 +02:00
|
|
|
quux
|
|
|
|
foo\xFFbar
|
|
|
|
baz
|
2020-02-18 01:08:47 +02:00
|
|
|
"[..],
|
|
|
|
)
|
|
|
|
.unwrap();
|
2018-02-04 03:33:52 +02:00
|
|
|
assert_eq!(errs.len(), 1);
|
2020-02-18 01:08:47 +02:00
|
|
|
assert_eq!(args, vec![OsString::from("quux"), OsString::from("baz"),]);
|
2018-02-04 03:33:52 +02:00
|
|
|
}
|
|
|
|
}
|