Revert "Fix remkop#1351 with some modification"

This reverts commit fabab83.
MarkoMackic · Oct 17, 2021 · 10880b4 · 10880b4
1 parent ec21508
commit 10880b4
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/src/main/java/picocli/CommandLine.java b/src/main/java/picocli/CommandLine.java
@@ -8680,17 +8680,16 @@ public String[] description() {
  private String[] expandVariables(String[] desc) {
  if (desc.length == 0) { return desc; }
  StringBuilder candidates = new StringBuilder();
- boolean isCompletionCandidatesUsed = false;
- for (String s: desc) {
- if (s.contains(DESCRIPTION_VARIABLE_COMPLETION_CANDIDATES)) {
- isCompletionCandidatesUsed = true;
- break;
+ if (completionCandidates() != null) {
+ boolean isCompletionCandidatesUsed = false;
+ for (String s: desc) {
+ if (s.contains(DESCRIPTION_VARIABLE_COMPLETION_CANDIDATES)) {
+ isCompletionCandidatesUsed = true;
+ break;
+ }
  }
- }
- if (isCompletionCandidatesUsed) {
- Iterable<String> iter = completionCandidates();
- if (iter != null) {
- for (String c : iter) {
+ if (isCompletionCandidatesUsed){
+ for (String c : completionCandidates()) {
  if (candidates.length() > 0) { candidates.append(", "); }
  candidates.append(c);
  }