diff --git a/src/main/java/com/beust/jcommander/JCommander.java b/src/main/java/com/beust/jcommander/JCommander.java index ea90822f..f0e9928f 100644 --- a/src/main/java/com/beust/jcommander/JCommander.java +++ b/src/main/java/com/beust/jcommander/JCommander.java @@ -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); @@ -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; } /** diff --git a/src/test/java/com/beust/jcommander/JCommanderTest.java b/src/test/java/com/beust/jcommander/JCommanderTest.java index 92954345..a1e59c7a 100644 --- a/src/test/java/com/beust/jcommander/JCommanderTest.java +++ b/src/test/java/com/beust/jcommander/JCommanderTest.java @@ -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 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 pair; + @Parameter + List 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;