Refactor completion function #560
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Improve documentation - Reorganise into functions - Order options lexicographically - Correct minor wording inconsistencies - Fix --count error - Fix --maxdepth error - Fix --path-separator error - Fix --version error - Adjust exclusivity for --files, -h, -j, -o, -r, -t, -T, -v, -V, &c. - Improve pattern-operand guard behaviour - Partially fix issue with colorspec state - Fix issue with typespec state - Add completion for <type>:include: sequence - Move licence info out of the way
BurntSushi
approved these changes
Jul 18, 2017
| # Compares options in `rg --help` output to options in zsh completion function | ||
| # | ||
| # @todo If we could rely on zsh being installed we could change all of this to | ||
| # simply source the completion-function file and pull the rg_args array out... |
There was a problem hiding this comment.
It seems like you could probably install zsh in the Travis CI config?
There was a problem hiding this comment.
Oh, i wasn't sure it was an option. Knowing that it is, i'll probably do that the next time i need to make changes to the function.
|
sigh It looks like Windows CI is failing due to an unrelated test failure. Merging this anyway. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hey again! I've been collecting issues left over from my previous effort and i think i've found as many as i can for now.
The biggest problem, which was carried over from the original, was that option completion was basically broken on zsh 5.1 (the latest version available in Ubuntu Xenial). But i also found some typos in option names, missing actions for options that take arguments, missing exclusion rules, &c.
In addition to fixing bugs i improved the
colorspechandling slightly, and i added completion for sequences of types when given--type-add <type>:include:. And i re-ordered the options to match the--helpoutput like i mentioned wanting to do before.I tested this on zsh 5.1, zsh 5.2, and zsh 5.3 and it seems OK. Really hard to test properly though, so i'm sure i'll find something again....