Revert "Fix remkop#1351 with some modification and another test"

This reverts commit 1280ae7.
MarkoMackic · Oct 17, 2021 · b151041 · b151041
1 parent 72f569f
commit b151041
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 33 deletions.
diff --git a/src/main/java/picocli/CommandLine.java b/src/main/java/picocli/CommandLine.java
@@ -8680,19 +8680,19 @@ public String[] description()  {
             private String[] expandVariables(String[] desc) {
                 if (desc.length == 0) { return desc; }
                 StringBuilder candidates = new StringBuilder();
-                if (completionCandidates() != null) {
-                    boolean isCompletionCandidatesUsed = false;
-                    for (String s: desc) {
-                        if (s.contains(DESCRIPTION_VARIABLE_COMPLETION_CANDIDATES)) {
-                            isCompletionCandidatesUsed = true;
-                            break;
-                        }
+
+                boolean flag = false;
+                for (String s: desc) {
+                    if (s.contains(DESCRIPTION_VARIABLE_COMPLETION_CANDIDATES)) {
+                        flag = true;
+                        break;
                     }
-                    if (isCompletionCandidatesUsed){
-                        for (String c : completionCandidates()) {
-                            if (candidates.length() > 0) { candidates.append(", "); }
-                            candidates.append(c);
-                        }
+                }
+
+                if (completionCandidates() != null && flag) {
+                    for (String c : completionCandidates()) {
+                        if (candidates.length() > 0) { candidates.append(", "); }
+                        candidates.append(c);
                     }
                 }
                 String defaultValueString = defaultValueString(false); // interpolate later

diff --git a/src/test/java/picocli/Issue1351.java b/src/test/java/picocli/Issue1351.java
@@ -9,7 +9,8 @@
 import static org.junit.Assert.assertEquals;
 
 public class Issue1351 {
-    static boolean testUsed;
+    static int flag = 0;
+
     static class MyIterator implements Iterator<String> {
         private int cursor;
         private final String[] a;
@@ -21,7 +22,7 @@ static class MyIterator implements Iterator<String> {
         @Override
         public boolean hasNext() {
             // Do something in the iterator, maybe talking to a server as was mentioned in issue 1351.
-            testUsed = true;
+            flag = flag + 1;
             return this.cursor < this.a.length;
         }
 
@@ -45,30 +46,15 @@ public Iterator<String> iterator() {
     }
 
     @CommandLine.Command
-    class TestCommandWithoutCompletion {
+    class TestCommand {
         @CommandLine.Option(names = "-o", completionCandidates = MyIterable.class,
                 description = "Candidates: A, B, C")
         String option;
     }
 
-    @CommandLine.Command
-    class TestCommandWithCompletion{
-        @CommandLine.Option(names = "-o", completionCandidates = MyIterable.class,
-                description = "Candidates: ${COMPLETION-CANDIDATES}")
-        String option;
-    }
-
-    @Test
-    public void testCompletionCandidatesUnused() {
-        testUsed = false;
-        CommandLine.usage(new TestCommandWithoutCompletion(), System.out);
-        assertEquals(false, testUsed);
-    }
-
     @Test
-    public void testCompletionCandidatesUsed(){
-        testUsed = false;
-        CommandLine.usage(new TestCommandWithCompletion(), System.out);
-        assertEquals(true, testUsed);
+    public void testIssue1351() {
+        CommandLine.usage(new TestCommand(), System.out);
+        assertEquals(0, flag);
     }
 }