Allow jline help to be overridden by picocli help, which is much nicer

remkop · Dec 14, 2020 · a0574dd · a0574dd
1 parent 103ad14
commit a0574dd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/picocli-shell-jline3/src/main/java/picocli/shell/jline3/PicocliCommands.java b/picocli-shell-jline3/src/main/java/picocli/shell/jline3/PicocliCommands.java
@@ -22,6 +22,8 @@
 import org.jline.reader.LineReader;
 import org.jline.reader.ParsedLine;
 import org.jline.reader.impl.LineReaderImpl;
+import org.jline.reader.impl.completer.ArgumentCompleter;
+import org.jline.reader.impl.completer.NullCompleter;
 import org.jline.reader.impl.completer.SystemCompleter;
 import org.jline.utils.AttributedString;
 
@@ -110,9 +112,9 @@ public SystemCompleter compileCompleters() {
         return out;
     }
 
-    private class PicocliCompleter implements Completer {
+    private class PicocliCompleter extends ArgumentCompleter implements Completer {
 
-        public PicocliCompleter() {}
+        public PicocliCompleter() { super(NullCompleter.INSTANCE); }
 
         @Override
         public void complete(LineReader reader, ParsedLine commandLine, List<Candidate> candidates) {

diff --git a/picocli-shell-jline3/src/test/java/picocli/shell/jline3/example/Example.java b/picocli-shell-jline3/src/test/java/picocli/shell/jline3/example/Example.java
@@ -143,6 +143,7 @@ public static void main(String[] args) {
             try (Terminal terminal = TerminalBuilder.builder().build()) {
                 SystemRegistry systemRegistry = new SystemRegistryImpl(parser, terminal, Example::workDir, null);
                 systemRegistry.setCommandRegistries(builtins, picocliCommands);
+                systemRegistry.register("help", picocliCommands);
 
                 LineReader reader = LineReaderBuilder.builder()
                         .terminal(terminal)