Skip to content

Add new options for parsing: ignore and skip #379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
garydgregory merged 8 commits into from
Jun 10, 2025
Merged

Add new options for parsing: ignore and skip #379

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
61cf3d2
Make method possible override
cstamas Jun 9, 2025
3f7d699
Un-hide this method that may be needed in override.
cstamas Jun 9, 2025
36d7d59
Add tests
cstamas Jun 9, 2025
4e65408
Simplify non-happy path
cstamas Jun 9, 2025
f74b1b7
Add test for "legacy" behaviour
cstamas Jun 9, 2025
46b169d
Drop line
cstamas Jun 9, 2025
281ffb6
Switch to enum
cstamas Jun 10, 2025
1ebf62b
Use vararg for args
cstamas Jun 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions src/main/java/org/apache/commons/cli/DefaultParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ private void handleToken(final String token) throws ParseException {
if (token != null) {
currentToken = token;
if (skipParsing) {
cmd.addArg(token);
addArg(token);
} else if ("--".equals(token)) {
skipParsing = true;
} else if (currentOption != null && currentOption.acceptsArg() && isArgument(token)) {
Expand All @@ -582,17 +582,28 @@ private void handleToken(final String token) throws ParseException {
* the remaining tokens are added as-is in the arguments of the command line.
*
* @param token the command line token to handle
* @throws ParseException if parsing should fail
*/
private void handleUnknownToken(final String token) throws ParseException {
protected void handleUnknownToken(final String token) throws ParseException {
if (token.startsWith("-") && token.length() > 1 && !stopAtNonOption) {
throw new UnrecognizedOptionException("Unrecognized option: " + token, token);
}
cmd.addArg(token);
addArg(token);
if (stopAtNonOption) {
skipParsing = true;
}
}

/**
* Adds token to command line {@link CommandLine#addArg(String)}.
*
* @param token the unrecognized option/argument.
* @since 1.10.0
*/
protected void addArg(final String token) {
cmd.addArg(token);
}

/**
* Tests if the token is a valid argument.
*
Expand Down