changeset 46894:8e950730d2c8

8182297: jshell tool: pasting multiple lines of code truncated Summary: Read input needs to be kept across ConsoleReader.readLine invocations unless consumed. Reviewed-by: rfield
author jlahoda
date Tue, 22 Aug 2017 13:08:15 +0200
parents 4c5a4cd5b092
children 16e7cacc7896
files jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/ConsoleReader.java
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/ConsoleReader.java	Tue Aug 22 12:04:53 2017 +0530
+++ b/jdk/src/jdk.internal.le/share/classes/jdk/internal/jline/console/ConsoleReader.java	Tue Aug 22 13:08:15 2017 +0200
@@ -29,6 +29,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -2338,8 +2339,6 @@
                 out.flush();
             }
 
-            Stack<Character> pushBackChar = new Stack<Character>();
-
             if (terminal.isAnsiSupported() && System.console() != null) {
                 //detect the prompt length by reading the cursor position from the terminal
                 //the real prompt length could differ from the simple prompt length due to
@@ -2357,9 +2356,11 @@
                     if (m.matches()) {
                         promptLen = Integer.parseInt(m.group("column")) - 1;
                         String prefix = m.group("prefix");
+                        List<Character> chars = new ArrayList<>();
                         for (int i = prefix.length() - 1; i >= 0; i--) {
-                            pushBackChar.push(prefix.charAt(i));
+                            chars.add(prefix.charAt(i));
                         }
+                        pushBackChar.addAll(0, chars);
                         break;
                     }
                 }
@@ -3224,6 +3225,7 @@
     //where:
         private Pattern CURSOR_COLUMN_PATTERN =
                 Pattern.compile("(?<prefix>.*)\033\\[[0-9]+;(?<column>[0-9]+)R", Pattern.DOTALL);
+        private Stack<Character> pushBackChar = new Stack<Character>();
 
     /**
      * Read a line for unsupported terminals.