Revert "Fix remkop#1351"

This reverts commit 61eeba8.
MarkoMackic · Oct 17, 2021 · 64d9371 · 64d9371
1 parent b151041
commit 64d9371
Show file tree

Hide file tree

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

diff --git a/src/test/java/picocli/Issue1351.java b/src/test/java/picocli/Issue1351.java