[GR-26181] Upgrade to JLine 3.13.2.

PullRequest: graalpython/1303

Author: timfel

THIRD_PARTY_LICENSE.txt

@@ -3160,3 +3160,43 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+================================================================================
+
+JLine 3.13
+
+Copyright (c) 2002-2016, the original author or authors.
+Copyright (c) 2002-2018, the original author or authors.
+All rights reserved.
+
+https://opensource.org/licenses/BSD-3-Clause
+
+Redistribution and use in source and binary forms, with or
+without modification, are permitted provided that the following
+conditions are met:
+
+Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with
+the distribution.
+
+Neither the name of JLine nor the names of its contributors
+may be used to endorse or promote products derived from this
+software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/ConsoleHandler.java

@@ -71,17 +71,13 @@ public final String readLine() {
 
     public abstract void setPrompt(String prompt);
 
-    public void addCompleter(@SuppressWarnings("unused") Function<String, List<String>> completer) {
-        // ignore by default
-    }
-
     public void setContext(@SuppressWarnings("unused") Context context) {
         // ignore by default
     }
 
     @SuppressWarnings("unused")
-    public void setHistory(BooleanSupplier shouldRecord, IntSupplier getSize, Consumer<String> addItem, IntFunction<String> getItem, BiConsumer<Integer, String> setItem, IntConsumer removeItem,
-                    Runnable clear) {
+    public void setupReader(BooleanSupplier shouldRecord, IntSupplier getSize, Consumer<String> addItem, IntFunction<String> getItem, BiConsumer<Integer, String> setItem, IntConsumer removeItem,
+                    Runnable clear, Function<String, List<String>> completer) {
         // ignore by default
     }
 

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/DefaultConsoleHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -44,26 +44,18 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.PrintStream;
 
 public class DefaultConsoleHandler extends ConsoleHandler {
 
     private final BufferedReader in;
-    private final PrintStream out;
-    private String prompt;
 
-    public DefaultConsoleHandler(InputStream in, OutputStream out) {
+    public DefaultConsoleHandler(InputStream in) {
         this.in = new BufferedReader(new InputStreamReader(in));
-        this.out = new PrintStream(out);
     }
 
     @Override
     public String readLine(boolean showPrompt) {
         try {
-            if (prompt != null && showPrompt) {
-                out.print(prompt);
-            }
             return in.readLine();
         } catch (IOException e) {
             throw new RuntimeException(e);
@@ -72,6 +64,5 @@ public String readLine(boolean showPrompt) {
 
     @Override
     public void setPrompt(String prompt) {
-        this.prompt = prompt;
     }
 }

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java

@@ -57,8 +57,8 @@
 import org.graalvm.polyglot.Value;
 
 import com.oracle.truffle.llvm.toolchain.launchers.common.Driver;
-
-import jline.console.UserInterruptException;
+import java.util.function.Function;
+import org.graalvm.shadowed.org.jline.reader.UserInterruptException;
 
 public class GraalPythonMain extends AbstractLanguageLauncher {
     public static void main(String[] args) {
@@ -81,7 +81,7 @@ public static void main(String[] args) {
     private boolean quietFlag = false;
     private boolean noUserSite = false;
     private boolean noSite = false;
-    private boolean stdinIsInteractive = System.console() != null;
+    private final boolean stdinIsInteractive = System.console() != null;
     private boolean unbufferedIO = false;
     private boolean multiContext = false;
     private VersionAction versionAction = VersionAction.None;
@@ -458,7 +458,8 @@ protected void launch(Builder contextBuilder) {
         contextBuilder.option("python.UnbufferedIO", Boolean.toString(unbufferedIO));
 
         ConsoleHandler consoleHandler = createConsoleHandler(System.in, System.out);
-        contextBuilder.arguments(getLanguageId(), programArgs.toArray(new String[0])).in(consoleHandler.createInputStream());
+        contextBuilder.arguments(getLanguageId(), programArgs.toArray(new String[programArgs.size()]));
+        contextBuilder.in(consoleHandler.createInputStream());
         contextBuilder.option("python.TerminalIsInteractive", Boolean.toString(stdinIsInteractive));
         contextBuilder.option("python.TerminalWidth", Integer.toString(consoleHandler.getTerminalWidth()));
         contextBuilder.option("python.TerminalHeight", Integer.toString(consoleHandler.getTerminalHeight()));
@@ -684,11 +685,12 @@ protected void collectArguments(Set<String> options) {
         options.add("--show-version");
     }
 
-    public ConsoleHandler createConsoleHandler(InputStream inStream, OutputStream outStream) {
-        if (inputFile != null || commandString != null) {
-            return new DefaultConsoleHandler(inStream, outStream);
+    private ConsoleHandler createConsoleHandler(InputStream inStream, OutputStream outStream) {
+        if (!stdinIsInteractive) {
+            return new DefaultConsoleHandler(inStream);
+        } else {
+            return new JLineConsoleHandler(inStream, outStream, false);
         }
-        return new JLineConsoleHandler(inStream, outStream, false);
     }
 
     /**
@@ -799,34 +801,37 @@ private void setupREPL(Context context, ConsoleHandler consoleHandler) {
         // history feature
         evalInternal(context, "import sys\ngetattr(sys, '__interactivehook__', lambda: None)()\n");
         final Value readline = evalInternal(context, "import readline; readline");
-        final Value completer = readline.getMember("get_completer").execute();
+        final Value getCompleter = readline.getMember("get_completer").execute();
         final Value shouldRecord = readline.getMember("get_auto_history");
         final Value addHistory = readline.getMember("add_history");
         final Value getHistoryItem = readline.getMember("get_history_item");
         final Value setHistoryItem = readline.getMember("replace_history_item");
         final Value deleteHistoryItem = readline.getMember("remove_history_item");
         final Value clearHistory = readline.getMember("clear_history");
         final Value getHistorySize = readline.getMember("get_current_history_length");
-        consoleHandler.setHistory(
-                        () -> shouldRecord.execute().asBoolean(),
-                        () -> getHistorySize.execute().asInt(),
-                        (item) -> addHistory.execute(item),
-                        (pos) -> getHistoryItem.execute(pos).asString(),
-                        (pos, item) -> setHistoryItem.execute(pos, item),
-                        (pos) -> deleteHistoryItem.execute(pos),
-                        () -> clearHistory.execute());
 
-        if (completer.canExecute()) {
-            consoleHandler.addCompleter((buffer) -> {
+        Function<String, List<String>> completer = null;
+        if (getCompleter.canExecute()) {
+            completer = (buffer) -> {
                 List<String> candidates = new ArrayList<>();
-                Value candidate = completer.execute(buffer, candidates.size());
+                Value candidate = getCompleter.execute(buffer, candidates.size());
                 while (candidate.isString()) {
                     candidates.add(candidate.asString());
-                    candidate = completer.execute(buffer, candidates.size());
+                    candidate = getCompleter.execute(buffer, candidates.size());
                 }
                 return candidates;
-            });
+            };
         }
+        consoleHandler.setupReader(
+                        () -> shouldRecord.execute().asBoolean(),
+                        () -> getHistorySize.execute().asInt(),
+                        (item) -> addHistory.execute(item),
+                        (pos) -> getHistoryItem.execute(pos).asString(),
+                        (pos, item) -> setHistoryItem.execute(pos, item),
+                        (pos) -> deleteHistoryItem.execute(pos),
+                        () -> clearHistory.execute(),
+                        completer);
+
     }
 
     /**