Fix #1351 with some modification

remkop · Apr 21, 2021 · 6c23752 · 6c23752
1 parent 7175846
commit 6c23752
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/src/main/java/picocli/CommandLine.java b/src/main/java/picocli/CommandLine.java
@@ -8680,16 +8680,17 @@ 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 isCompletionCandidatesUsed = false;
+                for (String s: desc) {
+                    if (s.contains(DESCRIPTION_VARIABLE_COMPLETION_CANDIDATES)) {
+                        isCompletionCandidatesUsed = true;
+                        break;
                     }
-                    if (isCompletionCandidatesUsed){
-                        for (String c : completionCandidates()) {
+                }
+                if (isCompletionCandidatesUsed) {
+                    Iterable<String> iter = completionCandidates();
+                    if (iter != null) {
+                        for (String c : iter) {
                             if (candidates.length() > 0) { candidates.append(", "); }
                             candidates.append(c);
                         }