Bump JLine to 3.15.0, fixes #1098

remkop · Jun 3, 2020 · d0cbcd5 · d0cbcd5
1 parent 6dbaf3a
commit d0cbcd5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -74,7 +74,6 @@ allprojects {
     compileTestJava.options.encoding = "UTF-8"
 
     repositories {
-        mavenLocal()
         jcenter()
     }
 

diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,7 @@ ivyVersion          = 2.4.0
 jacocoVersion       = 0.8.2
 jansiVersion        = 1.15
 jlineVersion        = 2.14.6
-jline3Version       = 3.14.2-SNAPSHOT
+jline3Version       = 3.15.0
 junitDepVersion     = 4.11
 junitVersion        = 4.12
 springBootVersion   = 2.2.2.RELEASE

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
@@ -5,15 +5,15 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import org.jline.builtins.CommandRegistry;
-import org.jline.builtins.Completers.SystemCompleter;
 import org.jline.builtins.Options.HelpException;
-import org.jline.builtins.Widgets.ArgDesc;
-import org.jline.builtins.Widgets.CmdDesc;
+import org.jline.console.ArgDesc;
+import org.jline.console.CmdDesc;
+import org.jline.console.CommandRegistry;
 import org.jline.reader.Candidate;
 import org.jline.reader.Completer;
 import org.jline.reader.LineReader;
 import org.jline.reader.ParsedLine;
+import org.jline.reader.impl.completer.SystemCompleter;
 import org.jline.utils.AttributedString;
 import picocli.CommandLine;
 import picocli.CommandLine.Help;
@@ -208,4 +208,9 @@ public Set<String> commandNames() {
     public Map<String, String> commandAliases() {
         return aliasCommand;
     }
+
+    @Override
+    public CmdDesc commandDescription(String command) {
+        return null;
+    }
 }
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
@@ -175,8 +175,7 @@ public static void main(String[] args) {
                     .build();
             builtins.setLineReader(reader);
             commands.setReader(reader);
-            TailTipWidgets ttw = new TailTipWidgets(reader, systemRegistry::commandDescription, 5, TipType.COMPLETER);
-            ttw.setDescriptionCache(false);
+            new TailTipWidgets(reader, systemRegistry::commandDescription, 5, TipType.COMPLETER);
             KeyMap<Binding> keyMap = reader.getKeyMaps().get("main");
             keyMap.bind(new Reference("tailtip-toggle"), KeyMap.alt("s"));
 
@@ -195,7 +194,6 @@ public static void main(String[] args) {
                 } catch (EndOfFileException e) {
                     return;
                 } catch (Exception e) {
-                    e.printStackTrace();
                     systemRegistry.trace(e);
                 }
             }