Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/main/java/com/beust/jcommander/JCommander.java
Original file line number Diff line number Diff line change
Expand Up @@ -971,7 +971,7 @@ private int processFixedArity(String[] args, int originalIndex, ParameterDescrip
int offset = "--".equals(args[index + 1]) ? 1 : 0;

Object finalValue = null;
if (index + arity < args.length) {
if (arity < args.length - index - offset) {
for (int j = 1; j <= arity; j++) {
String value = args[index + j + offset];
finalValue = pd.addValue(arg, value, false, validate, j - 1);
Expand All @@ -989,7 +989,7 @@ private int processFixedArity(String[] args, int originalIndex, ParameterDescrip
throw new ParameterException("Expected a value after parameter " + arg);
}

return arity + 1;
return index - originalIndex + 1;
}

/**
Expand Down
41 changes: 41 additions & 0 deletions src/test/java/com/beust/jcommander/JCommanderTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -1268,6 +1268,47 @@ class Parameters {
Assert.assertEquals(args.mainParameters.get(4), "theName");
}

public void dashDashEscapesOptionValue() {
class Parameters {
@Parameter(names = "--value")
String value;
@Parameter(names = "--flag")
boolean flag;
@Parameter
List<String> mainParameters = new ArrayList<>();
}

Parameters args = new Parameters();
JCommander.newBuilder().addObject(args).build().parse("--value", "--", "--flag", "tail");
Assert.assertEquals(args.value, "--flag");
Assert.assertFalse(args.flag);
Assert.assertEquals(args.mainParameters, List.of("tail"));
}

public void dashDashFixedArityValues() {
class Parameters {
@Parameter(names = "--pair", arity = 2)
List<String> pair;
@Parameter
List<String> mainParameters = new ArrayList<>();
}

Parameters args = new Parameters();
JCommander.newBuilder().addObject(args).build().parse("--pair", "--", "first", "second", "tail");
Assert.assertEquals(args.pair, List.of("first", "second"));
Assert.assertEquals(args.mainParameters, List.of("tail"));
}

@Test(expectedExceptions = ParameterException.class)
public void dashDashMissingValue() {
class Parameters {
@Parameter(names = "--value")
String value;
}

JCommander.newBuilder().addObject(new Parameters()).build().parse("--value", "--");
}

public void access() {
class Parameters {
private int bar;
Expand Down
Loading