From cf3d90dfad81f2925078d603f000aee938062622 Mon Sep 17 00:00:00 2001 From: Phillip Kruger Date: Wed, 21 Jul 2021 19:26:48 +0200 Subject: [PATCH] Add new line on enter back Signed-off-by:Phillip Kruger --- .../console/ConsoleStateManager.java | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleStateManager.java b/core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleStateManager.java index 88d0c5e6d70e1..4be52a8848ed9 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleStateManager.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/console/ConsoleStateManager.java @@ -118,6 +118,7 @@ void installBuiltins(DevModeType devModeType) { ? toLevel(((LogManager) LogManager.getLogManager()).getLogger("").getLevel()).toString() : currentLevel.toString())), ConsoleStateManager.this::toggleLogLevel)); + commands.add(new ConsoleCommand((char) 13, null, null, 10001, null, this::printBlankLine)); commands.add(new ConsoleCommand('h', "Shows this help", "for more options", 10000, null, this::printHelp)); commands.add(new ConsoleCommand('q', "Quits the application", null, this::exitQuarkus)); context.reset(commands.toArray(new ConsoleCommand[0])); @@ -175,6 +176,10 @@ public void run() { } } + private void printBlankLine() { + System.out.println(""); + } + private void printHelp() { System.out.println("\nThe following commands are currently available:"); Set contexts = new HashSet<>(); @@ -186,13 +191,15 @@ private void printHelp() { .collect(Collectors.toList())) { System.out.println("\n" + RED + "==" + RESET + " " + UNDERLINE + ctx.name + NO_UNDERLINE + "\n"); for (var i : ctx.internal) { - if (i.getHelpState() == null) { - System.out.println(helpOption(i.getKey(), i.getDescription())); - } else if (i.getHelpState().toggleState != null) { - System.out.println(helpOption(i.getKey(), i.getDescription(), i.getHelpState().toggleState.get())); - } else { - System.out.println(helpOption(i.getKey(), i.getDescription(), i.getHelpState().stateSupplier.get(), - i.getHelpState().colorSupplier.get())); + if (i.getDescription() != null) { + if (i.getHelpState() == null) { + System.out.println(helpOption(i.getKey(), i.getDescription())); + } else if (i.getHelpState().toggleState != null) { + System.out.println(helpOption(i.getKey(), i.getDescription(), i.getHelpState().toggleState.get())); + } else { + System.out.println(helpOption(i.getKey(), i.getDescription(), i.getHelpState().stateSupplier.get(), + i.getHelpState().colorSupplier.get())); + } } } }