8350749: Upgrade JLine to 3.29.0

Reviewed-by: liach

Author: lahodaj

src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/LineReader.java

@@ -10,6 +10,7 @@
 
 import java.io.File;
 import java.io.InputStream;
+import java.nio.file.Path;
 import java.util.Collection;
 import java.util.Map;
 import java.util.function.IntConsumer;
@@ -766,7 +767,11 @@ String readLine(String prompt, String rightPrompt, MaskingCallback maskingCallba
 
     void addCommandsInBuffer(Collection<String> commands);
 
-    void editAndAddInBuffer(File file) throws Exception;
+    default void editAndAddInBuffer(File file) throws Exception {
+        editAndAddInBuffer(file != null ? file.toPath() : null);
+    }
+
+    void editAndAddInBuffer(Path file) throws Exception;
 
     String getLastBinding();
 

src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/UserInterruptException.java

@@ -19,6 +19,11 @@ public class UserInterruptException extends RuntimeException {
 
     private final String partialLine;
 
+    public UserInterruptException(Throwable cause) {
+        super(cause);
+        this.partialLine = null;
+    }
+
     public UserInterruptException(String partialLine) {
         this.partialLine = partialLine;
     }

src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/DefaultHighlighter.java

@@ -38,6 +38,7 @@ public AttributedString highlight(LineReader reader, String buffer) {
         int underlineEnd = -1;
         int negativeStart = -1;
         int negativeEnd = -1;
+        boolean first = true;
         String search = reader.getSearchTerm();
         if (search != null && search.length() > 0) {
             underlineStart = buffer.indexOf(search);
@@ -65,6 +66,7 @@ public AttributedString highlight(LineReader reader, String buffer) {
         }
 
         AttributedStringBuilder sb = new AttributedStringBuilder();
+        commandStyle(reader, sb, true);
         for (int i = 0; i < buffer.length(); i++) {
             if (i == underlineStart) {
                 sb.style(AttributedStyle::underline);
@@ -77,6 +79,10 @@ public AttributedString highlight(LineReader reader, String buffer) {
             }
 
             char c = buffer.charAt(i);
+            if (first && Character.isSpaceChar(c)) {
+                first = false;
+                commandStyle(reader, sb, false);
+            }
             if (c == '\t' || c == '\n') {
                 sb.append(c);
             } else if (c < 32) {
@@ -105,4 +111,6 @@ public AttributedString highlight(LineReader reader, String buffer) {
         }
         return sb.toAttributedString();
     }
+
+    protected void commandStyle(LineReader reader, AttributedStringBuilder sb, boolean enable) {}
 }

src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/LineReaderImpl.java

@@ -10,7 +10,6 @@
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.Flushable;
 import java.io.IOError;
@@ -1131,16 +1130,16 @@ public void addCommandsInBuffer(Collection<String> commands) {
     }
 
     @Override
-    public void editAndAddInBuffer(File file) throws Exception {
+    public void editAndAddInBuffer(Path file) throws Exception {
         if (isSet(Option.BRACKETED_PASTE)) {
             terminal.writer().write(BRACKETED_PASTE_OFF);
         }
-        Constructor<?> ctor = Class.forName("org.jline.builtins.Nano").getConstructor(Terminal.class, File.class);
-        Editor editor = (Editor) ctor.newInstance(terminal, new File(file.getParent()));
+        Constructor<?> ctor = Class.forName("org.jline.builtins.Nano").getConstructor(Terminal.class, Path.class);
+        Editor editor = (Editor) ctor.newInstance(terminal, file.getParent());
         editor.setRestricted(true);
-        editor.open(Collections.singletonList(file.getName()));
+        editor.open(Collections.singletonList(file.getFileName().toString()));
         editor.run();
-        try (BufferedReader br = new BufferedReader(new FileReader(file))) {
+        try (BufferedReader br = Files.newBufferedReader(file)) {
             String line;
             commandsBuffer.clear();
             while ((line = br.readLine()) != null) {
@@ -3529,7 +3528,7 @@ protected boolean viPutAfter() {
             buf.move(1);
             putString(yankBuffer);
             buf.move(-yankBuffer.length());
-        } else if (yankBuffer.length() != 0) {
+        } else if (!yankBuffer.isEmpty()) {
             if (buf.cursor() < buf.length()) {
                 buf.move(1);
             }
@@ -3547,7 +3546,7 @@ protected boolean viPutBefore() {
                 ;
             putString(yankBuffer);
             buf.move(-yankBuffer.length());
-        } else if (yankBuffer.length() != 0) {
+        } else if (!yankBuffer.isEmpty()) {
             if (buf.cursor() > 0) {
                 buf.move(-1);
             }

src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/SystemCompleter.java

@@ -9,6 +9,8 @@
 package jdk.internal.org.jline.reader.impl.completer;
 
 import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import jdk.internal.org.jline.reader.Candidate;
 import jdk.internal.org.jline.reader.Completer;
@@ -24,6 +26,7 @@
 public class SystemCompleter implements Completer {
     private Map<String, List<Completer>> completers = new HashMap<>();
     private Map<String, String> aliasCommand = new HashMap<>();
+    private Map<String, String> descriptions = new HashMap<>();
     private StringsCompleter commands;
     private boolean compiled = false;
 
@@ -124,6 +127,10 @@ private Map<String, String> getAliases() {
     }
 
     public void compile() {
+        compile(s -> new Candidate(AttributedString.stripAnsi(s), s, null, null, null, null, true));
+    }
+
+    public void compile(Function<String, Candidate> candidateBuilder) {
         if (compiled) {
             return;
         }
@@ -139,7 +146,7 @@ public void compile() {
         completers = compiledCompleters;
         Set<String> cmds = new HashSet<>(completers.keySet());
         cmds.addAll(aliasCommand.keySet());
-        commands = new StringsCompleter(cmds);
+        commands = new StringsCompleter(cmds.stream().map(candidateBuilder).collect(Collectors.toList()));
         compiled = true;
     }
 

src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/history/DefaultHistory.java

@@ -200,7 +200,7 @@ public void purge() throws IOException {
     public void write(Path file, boolean incremental) throws IOException {
         Path path = file != null ? file : getPath();
         if (path != null && Files.exists(path)) {
-            path.toFile().delete();
+            Files.deleteIfExists(path);
         }
         internalWrite(path, incremental ? getLastLoaded(path) : 0);
     }

src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/TerminalBuilder.java

@@ -209,41 +209,85 @@ public TerminalBuilder systemOutput(SystemOutput systemOutput) {
         return this;
     }
 
+    /**
+     * Forces the usage of the give terminal provider.
+     *
+     * @param provider The {@link TerminalProvider}'s name to use when creating the Terminal.
+     * @return The builder.
+     */
     public TerminalBuilder provider(String provider) {
         this.provider = provider;
         return this;
     }
 
+    /**
+     * Sets the list of providers to try when creating the terminal.
+     * If not specified, the system property {@link #PROP_PROVIDERS} will be used if set.
+     * Else, the value {@link #PROP_PROVIDERS_DEFAULT} will be used.
+     *
+     * @param providers The list of {@link TerminalProvider}'s names to check when creating the Terminal.
+     * @return The builder.
+     */
     public TerminalBuilder providers(String providers) {
         this.providers = providers;
         return this;
     }
 
+    /**
+     * Enables or disables the {@link #PROP_PROVIDER_JNA}/{@code jna} terminal provider.
+     * If not specified, the system property {@link #PROP_JNA} will be used if set.
+     * If not specified, the provider will be checked.
+     */
     public TerminalBuilder jna(boolean jna) {
         this.jna = jna;
         return this;
     }
 
+    /**
+     * Enables or disables the {@link #PROP_PROVIDER_JANSI}/{@code jansi} terminal provider.
+     * If not specified, the system property {@link #PROP_JANSI} will be used if set.
+     * If not specified, the provider will be checked.
+     */
     public TerminalBuilder jansi(boolean jansi) {
         this.jansi = jansi;
         return this;
     }
 
+    /**
+     * Enables or disables the {@link #PROP_PROVIDER_JNI}/{@code jni} terminal provider.
+     * If not specified, the system property {@link #PROP_JNI} will be used if set.
+     * If not specified, the provider will be checked.
+     */
     public TerminalBuilder jni(boolean jni) {
         this.jni = jni;
         return this;
     }
 
+    /**
+     * Enables or disables the {@link #PROP_PROVIDER_EXEC}/{@code exec} terminal provider.
+     * If not specified, the system property {@link #PROP_EXEC} will be used if set.
+     * If not specified, the provider will be checked.
+     */
     public TerminalBuilder exec(boolean exec) {
         this.exec = exec;
         return this;
     }
 
+    /**
+     * Enables or disables the {@link #PROP_PROVIDER_FFM}/{@code ffm} terminal provider.
+     * If not specified, the system property {@link #PROP_FFM} will be used if set.
+     * If not specified, the provider will be checked.
+     */
     public TerminalBuilder ffm(boolean ffm) {
         this.ffm = ffm;
         return this;
     }
 
+    /**
+     * Enables or disables the {@link #PROP_PROVIDER_DUMB}/{@code dumb} terminal provider.
+     * If not specified, the system property {@link #PROP_DUMB} will be used if set.
+     * If not specified, the provider will be checked.
+     */
     public TerminalBuilder dumb(boolean dumb) {
         this.dumb = dumb;
         return this;

src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractPosixTerminal.java

@@ -94,4 +94,13 @@ public TerminalProvider getProvider() {
     public SystemStream getSystemStream() {
         return getPty().getSystemStream();
     }
+
+    @Override
+    public String toString() {
+        return getKind() + "[" + "name='"
+                + name + '\'' + ", pty='"
+                + pty + '\'' + ", type='"
+                + type + '\'' + ", size='"
+                + getSize() + '\'' + ']';
+    }
 }

src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractTerminal.java

@@ -287,4 +287,12 @@ public boolean paused() {
     public ColorPalette getPalette() {
         return palette;
     }
+
+    @Override
+    public String toString() {
+        return getKind() + "[" + "name='"
+                + name + '\'' + ", type='"
+                + type + '\'' + ", size='"
+                + getSize() + '\'' + ']';
+    }
 }