refactor: rename { => _comp}{_get_first_arg,_count_args}
#1033
Conversation
This file contains hidden or 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
akinomyoga
force-pushed
the
refactor-api-2
branch
from
9ec88a4 to
5e2971b
Compare
akinomyoga
force-pushed
the
refactor-api-2
branch
from
caf7bf2 to
84b0537
Compare
scop
requested changes
Aug 31, 2023
akinomyoga
force-pushed
the
refactor-api-2
branch
2 times, most recently
from
2dec3ce to
3696585
Compare
scop
approved these changes
Sep 1, 2023
akinomyoga
force-pushed
the
refactor-api-2
branch
from
72e9c7d to
ab230e4
Compare
The check that unconditionally accepts a word by a pattern has been added by commits 75ec298 and 3809d95. However, even if the word matches the specified pattern, if the word is an option argument of the previous option, it should not be counted as an argument. This patch changes the behavior so that it does not treat the word matching $3 as an argument when it is an option argument. The current use case of $3 is only by chmod, where $2 is unspecified, so the behavior is unaffected by this change.
Co-authored-by: Ville Skyttä <ville.skytta@iki.fi>
The current interface does not distinguish the case where no argument is found and the case where the first argument is an empty string. This patch returns whether the first argument is found through the exit status. This also modifies the callers so that they use the exit status to check if the first argument is specified.
When the current implementation checks an option argument, it tests whether the previous word matches $2 (i.e., a pattern of options taking an option argument). This implementation has multiple issues: * When the options taking an option argument does not start with `-`, the option is counted as an independent argument. For example, `ssh` completion passes `@(-c|[-+]o)` as $2, but `+o` is counted as an argument with the current implementation. * An option argument that looks like an option taking an option argument can prevent the next word counted as an argument. For example, when `cmd -o -o arg` is processed with $2 being `-o`, the second `-o` should be treated as an option argument and `arg` should be counted as an argument. However, with the current implementation, `arg` is not counted because the previous word `-o` matches the pattern. * When `cmd -o -- -x` is processed with $2 being `-o`, `--` should be treated as an option argument so should lose its special meaning, and `-x` is still treated as an option. However, with the current implementation, `--` does not lose its special meaning, so `-x` is unexpectedly treated as an argument. * Also, with the current implementation, when $2 is not specified, an argument after an empty word is not counted as an argument because $2 matches the empty word, (though Readline usually do not store an empty word in COMP_WORDS). This patch fixes those issues by changing how options taking an option argument are processed.
akinomyoga
force-pushed
the
refactor-api-2
branch
from
ab230e4 to
874c503
Compare
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.
No description provided.