Fix shorthand combination edge case #2189
Open
+179
−20
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
|
|
|
cc @marckhouzam |
inicula
force-pushed
the
fix-shorthand-combination-bug
branch
from
56997f2
to
b07c5cd
Compare
|
This PR exceeds the recommended size of 200 lines. Please make sure you are NOT addressing multiple issues with one PR. Note this PR might be rejected due to its size. |
inicula
commented
Sep 14, 2024
| @@ -2253,14 +2253,70 @@ func TestTraverseWithParentFlags(t *testing.T) { | |||
| if err != nil { | |||
| t.Errorf("Unexpected error: %v", err) | |||
| } | |||
| if len(args) != 1 && args[0] != "--add" { | |||
| if len(args) != 1 || args[0] != "--int" { | |||
There was a problem hiding this comment.
The original condition seems wrong. --add wasn't mentioned anywhere else in the repo and from how I understand the test, || makes sense here, not &&.
inicula
commented
Sep 14, 2024
| @@ -2312,7 +2368,7 @@ func TestTraverseWithBadChildFlag(t *testing.T) { | |||
| if err != nil { | |||
| t.Errorf("Unexpected error: %v", err) | |||
| } | |||
| if len(args) != 1 && args[0] != "--str" { | |||
| if len(args) != 1 || args[0] != "--str" { | |||
Use a helper function for both code paths instead of duplicating the logic.
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.
Fixes: #2188
Note: This PR fixes the same bug in two different code paths (
c.Find()andc.Traverse()). They use different helper functions for parsing the arguments, but the fix is based on the same idea.cobra/command.go
Lines 1090 to 1094 in 78bfc83
The idea is that whenever we encounter a shorthand combination, we search for the first flag in the combination that needs a value (if there are no such flags, then we just go to the next argument). If this flag is the last flag in the shorthand combination, then the value will be expected in the next argument. Otherwise, if the flag is not on the last position of the shorthand combination, the value is expected to be given in the same argument (in this case, we go to the next argument without doing anything).