#676 interpolated string should resolve to null if no value found and…

… variable has no other text
remkop · May 2, 2019 · 8eafa1e · 8eafa1e
1 parent 3e21fcb
commit 8eafa1e
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/src/main/java/picocli/CommandLine.java b/src/main/java/picocli/CommandLine.java
@@ -1235,7 +1235,7 @@ public void clearExecutionResults() {
  * @see RunFirst
  * @see RunLast
  * @see RunAll
- * @deprecated use {@link IParameterExceptionHandler} instead, see {@link #execute(String...)}
+ * @deprecated use {@link IExecutionStrategy} instead, see {@link #execute(String...)}
  * @since 3.0 */
  @Deprecated public static interface IParseResultHandler2<R> {
  /** Processes the {@code ParseResult} object resulting from successfully
@@ -8832,11 +8832,11 @@ private String resolveLookups(String text, Set<String> visited, Map<String, Stri
  for (String lookupKey : lookups.keySet()) {
  ILookup lookup = lookups.get(lookupKey);
  String prefix = "${" + lookupKey;
- int sysStartPos = 0;
- while ((sysStartPos = findOpeningDollar(text, prefix, sysStartPos)) >= 0) {
- int endPos = findClosingBrace(text, sysStartPos + prefix.length());
+ int startPos = 0;
+ while ((startPos = findOpeningDollar(text, prefix, startPos)) >= 0) {
+ int endPos = findClosingBrace(text, startPos + prefix.length());
  if (endPos < 0) { endPos = text.length() - 1; }
- String fullKey = text.substring(sysStartPos + prefix.length(), endPos);
+ String fullKey = text.substring(startPos + prefix.length(), endPos);
  String actualKey = fullKey;
 
  int defaultStartPos = fullKey.indexOf(":-");
@@ -8852,10 +8852,13 @@ private String resolveLookups(String text, Set<String> visited, Map<String, Stri
  value = resolveLookups(defaultValue, visited, resolved);
  }
  resolved.put(prefix + actualKey, value);
+ if (value == null && startPos == 0 && endPos == text.length() - 1) {
+ return null;
+ }
 
  // interpolate
- text = text.substring(0, sysStartPos) + value + text.substring(endPos + 1);
- sysStartPos += value == null ? "null".length() : value.length();
+ text = text.substring(0, startPos) + value + text.substring(endPos + 1);
+ startPos += value == null ? "null".length() : value.length();
  }
  }
  return text.replace("$$", "$");