Groovy REPL demo erroneously can complete groovy statements in shell command, fixes #663

mattirn · mattirn · commit eb1199ec5774 · 2021-04-02T17:02:42.000+02:00
diff --git a/console/src/main/java/org/jline/console/impl/SystemHighlighter.java b/console/src/main/java/org/jline/console/impl/SystemHighlighter.java
@@ -70,8 +70,7 @@ protected AttributedString systemHighlight(LineReader reader, String buffer) {
             out = new AttributedStringBuilder().append(buffer).toAttributedString();
         } else if (fileHighlight.contains(command)) {
             out = doFileHighlight(reader, buffer);
-        } else if (systemRegistry.isCommandOrScript(command) || systemRegistry.isCommandAlias(command)
-                || command.startsWith("!")) {
+        } else if (systemRegistry.isCommandOrScript(command) || systemRegistry.isCommandAlias(command)) {
             out = doCommandHighlight(buffer);
         } else if (langHighlighter != null) {
             out = langHighlighter.highlight(buffer);
diff --git a/demo/src/main/java/org/jline/demo/Repl.java b/demo/src/main/java/org/jline/demo/Repl.java
@@ -224,6 +224,17 @@ public void run() {
         }
     }
 
+    private static class ReplSystemRegistry extends SystemRegistryImpl {
+        public ReplSystemRegistry(Parser parser, Terminal terminal, Supplier<Path> workDir, ConfigurationPath configPath) {
+            super(parser, terminal, workDir, configPath);
+        }
+
+        @Override
+        public boolean isCommandOrScript(String command) {
+            return command.startsWith("!") || super.isCommandOrScript(command);
+        }
+    }
+
     public static void main(String[] args) {
         try {
             Supplier<Path> workDir = () -> Paths.get(System.getProperty("user.dir"));
@@ -264,7 +275,7 @@ public static void main(String[] args) {
                                                                   , workDir, configPath);
             Builtins builtins = new Builtins(workDir, configPath,  (String fun)-> new ConsoleEngine.WidgetCreator(consoleEngine, fun));
             MyCommands myCommands = new MyCommands(workDir);
-            SystemRegistryImpl systemRegistry = new SystemRegistryImpl(parser, terminal, workDir, configPath);
+            ReplSystemRegistry systemRegistry = new ReplSystemRegistry(parser, terminal, workDir, configPath);
             systemRegistry.register("groovy", new GroovyCommand(scriptEngine, printer));
             systemRegistry.setCommandRegistries(consoleEngine, builtins, myCommands);
             systemRegistry.addCompleter(scriptEngine.getScriptCompleter());
