mirror of
https://github.com/BurntSushi/ripgrep.git
synced 2024-12-02 02:56:32 +02:00
082245dadb
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
98 lines
3.1 KiB
Bash
Executable File
98 lines
3.1 KiB
Bash
Executable File
#!/usr/bin/env zsh
|
|
|
|
emulate zsh -o extended_glob -o no_function_argzero -o no_unset
|
|
|
|
##
|
|
# Compares options in `rg --help` output to options in zsh completion function
|
|
|
|
get_comp_args() {
|
|
# Technically there are many options that the completion system sets that
|
|
# our function may rely on, but we'll trust that we've got it mostly right
|
|
setopt local_options unset
|
|
|
|
# Our completion function recognises a special variable which tells it to
|
|
# dump the _arguments specs and then just return. But do this in a sub-shell
|
|
# anyway to avoid any weirdness
|
|
( _RG_COMPLETE_LIST_ARGS=1 source $1 )
|
|
}
|
|
|
|
main() {
|
|
local diff
|
|
local rg="${0:a:h}/../${TARGET_DIR:-target}/release/rg"
|
|
local _rg="${0:a:h}/../crates/core/flags/complete/rg.zsh"
|
|
local -a help_args comp_args
|
|
|
|
[[ -e $rg ]] || rg=${rg/%\/release\/rg/\/debug\/rg}
|
|
|
|
rg=${rg:a}
|
|
_rg=${_rg:a}
|
|
|
|
[[ -e $rg ]] || {
|
|
print -r >&2 "File not found: $rg"
|
|
return 1
|
|
}
|
|
[[ -e $_rg ]] || {
|
|
print -r >&2 "File not found: $_rg"
|
|
return 1
|
|
}
|
|
|
|
print -rl - 'Comparing options:' "-$rg" "+$_rg"
|
|
|
|
# 'Parse' options out of the `--help` output. To prevent false positives we
|
|
# only look at lines where the first non-white-space character is `-`, or
|
|
# where a long option starting with certain letters (see `_rg`) is found.
|
|
# Occasionally we may have to handle some manually, however
|
|
help_args=( ${(f)"$(
|
|
$rg --help |
|
|
$rg -i -- '^\s+--?[a-z0-9.]|--[a-z]' |
|
|
$rg -ior '$1' -- $'[\t /\"\'`.,](-[a-z0-9.]|--[a-z0-9-]+)(,|\\b)' |
|
|
$rg -v -- --print0 | # False positives
|
|
sort -u
|
|
)"} )
|
|
|
|
# 'Parse' options out of the completion function
|
|
comp_args=( ${(f)"$( get_comp_args $_rg )"} )
|
|
|
|
# Note that we currently exclude hidden (!...) options; matching these
|
|
# properly against the `--help` output could be irritating
|
|
comp_args=( ${comp_args#\(*\)} ) # Strip excluded options
|
|
comp_args=( ${comp_args#\*} ) # Strip repetition indicator
|
|
comp_args=( ${comp_args%%-[:[]*} ) # Strip everything after -optname-
|
|
comp_args=( ${comp_args%%[:+=[]*} ) # Strip everything after other optspecs
|
|
comp_args=( ${comp_args##[^-]*} ) # Remove non-options
|
|
comp_args=( ${(f)"$( print -rl - $comp_args | sort -u )"} )
|
|
|
|
(( $#help_args )) || {
|
|
print -r >&2 'Failed to get help_args'
|
|
return 1
|
|
}
|
|
(( $#comp_args )) || {
|
|
print -r >&2 'Failed to get comp_args'
|
|
return 1
|
|
}
|
|
|
|
diff="$(
|
|
if diff --help 2>&1 | grep -qF -- '--label'; then
|
|
diff -U2 \
|
|
--label '`rg --help`' \
|
|
--label '`_rg`' \
|
|
=( print -rl - $help_args ) =( print -rl - $comp_args )
|
|
else
|
|
diff -U2 \
|
|
-L '`rg --help`' \
|
|
-L '`_rg`' \
|
|
=( print -rl - $help_args ) =( print -rl - $comp_args )
|
|
fi
|
|
)"
|
|
|
|
(( $#diff )) && {
|
|
printf >&2 '%s\n' 'zsh completion options differ from `--help` options:'
|
|
printf >&2 '%s\n' $diff
|
|
return 1
|
|
}
|
|
printf 'OK\n'
|
|
return 0
|
|
}
|
|
|
|
main "$@"
|