Add the "clear" command to the CLI

findinpath · electrum · commit 0dfafc8f1278 · 2021-05-03T15:46:54.000-07:00
Note that this very same functionality can already be achieved
by using the ctrl-L keyboard shortcut.
diff --git a/client/trino-cli/src/main/java/io/trino/cli/Console.java b/client/trino-cli/src/main/java/io/trino/cli/Console.java
@@ -31,6 +31,7 @@
 import org.jline.reader.UserInterruptException;
 import org.jline.terminal.Terminal;
 import org.jline.utils.AttributedStringBuilder;
+import org.jline.utils.InfoCmp;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Mixin;
 import picocli.CommandLine.Option;
@@ -259,6 +260,11 @@ private static void runConsole(QueryRunner queryRunner, AtomicBoolean exiting)
                     case "exit":
                     case "quit":
                         return;
+                    case "clear":
+                        Terminal terminal = reader.getTerminal();
+                        terminal.puts(InfoCmp.Capability.clear_screen);
+                        terminal.flush();
+                        continue;
                     case "history":
                         for (History.Entry entry : reader.getHistory()) {
                             System.out.println(new AttributedStringBuilder()
diff --git a/client/trino-cli/src/main/java/io/trino/cli/Help.java b/client/trino-cli/src/main/java/io/trino/cli/Help.java
@@ -22,6 +22,7 @@ public static String getHelpText()
         return "" +
                 "Supported commands:\n" +
                 "QUIT\n" +
+                "CLEAR\n" +
                 "EXPLAIN [ ( option [, ...] ) ] <query>\n" +
                 "    options: FORMAT { TEXT | GRAPHVIZ | JSON }\n" +
                 "             TYPE { LOGICAL | DISTRIBUTED | VALIDATE | IO }\n" +
diff --git a/client/trino-cli/src/main/java/io/trino/cli/InputParser.java b/client/trino-cli/src/main/java/io/trino/cli/InputParser.java
@@ -30,7 +30,7 @@
 public class InputParser
         implements Parser
 {
-    private static final Set<String> SPECIAL = ImmutableSet.of("exit", "quit", "history", "help");
+    private static final Set<String> SPECIAL = ImmutableSet.of("exit", "quit", "history", "help", "clear");
 
     @Override
     public ParsedLine parse(String line, int cursor, ParseContext context)

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`public class InputParser`
`31`	`31`	`implements Parser`
`32`	`32`	`{`
`33`		`- private static final Set<String> SPECIAL = ImmutableSet.of("exit", "quit", "history", "help");`
	`33`	`+ private static final Set<String> SPECIAL = ImmutableSet.of("exit", "quit", "history", "help", "clear");`
`34`	`34`
`35`	`35`	`@Override`
`36`	`36`	`public ParsedLine parse(String line, int cursor, ParseContext context)`