From 125be8c265656a3ae801d74b912fbdc7c2790e3a Mon Sep 17 00:00:00 2001 From: Tako Schotanus Date: Sat, 28 Dec 2024 23:55:02 +0100 Subject: [PATCH] Now removing NoResults from the prompt --- .../java/org/jline/consoleui/prompt/ConsolePrompt.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/console-ui/src/main/java/org/jline/consoleui/prompt/ConsolePrompt.java b/console-ui/src/main/java/org/jline/consoleui/prompt/ConsolePrompt.java index 4a1d7ca0..4d1e9b31 100644 --- a/console-ui/src/main/java/org/jline/consoleui/prompt/ConsolePrompt.java +++ b/console-ui/src/main/java/org/jline/consoleui/prompt/ConsolePrompt.java @@ -130,7 +130,7 @@ public Map prompt( try { Map resultMap = new HashMap<>(); prompt(header, promptableElementList, resultMap); - return resultMap; + return removeNoResults(resultMap); } finally { close(); } @@ -203,7 +203,7 @@ public Map prompt( peResult = new HashMap<>(); } } - return resultMap; + return removeNoResults(resultMap); } finally { // Restore the original state of cancellable config.setCancellableFirstPrompt(cancellable); @@ -403,6 +403,12 @@ private void removePreviousResult(PromptableElementIF pe) { } } + private Map removeNoResults(Map resultMap) { + return resultMap.entrySet().stream() + .filter(e -> !(e.getValue() instanceof NoResult)) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); + } + /** * Creates a {@link PromptBuilder}. *