8164260: readLine does not echo characters
Reviewed-by: jlaskey
This commit is contained in:
parent
f2cc9a6362
commit
a225cebefc
nashorn/src
jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs
jdk.scripting.nashorn/share/classes/jdk/nashorn
@ -34,6 +34,7 @@ import java.io.File;
|
|||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.io.InputStreamReader;
|
import java.io.InputStreamReader;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.io.UncheckedIOException;
|
||||||
import java.io.OutputStream;
|
import java.io.OutputStream;
|
||||||
import java.io.PrintWriter;
|
import java.io.PrintWriter;
|
||||||
import java.net.URI;
|
import java.net.URI;
|
||||||
@ -50,6 +51,7 @@ import jdk.nashorn.internal.runtime.NativeJavaPackage;
|
|||||||
import jdk.nashorn.internal.runtime.Property;
|
import jdk.nashorn.internal.runtime.Property;
|
||||||
import jdk.nashorn.internal.runtime.ScriptEnvironment;
|
import jdk.nashorn.internal.runtime.ScriptEnvironment;
|
||||||
import jdk.nashorn.internal.runtime.ScriptFunction;
|
import jdk.nashorn.internal.runtime.ScriptFunction;
|
||||||
|
import jdk.nashorn.internal.runtime.ScriptingFunctions;
|
||||||
import jdk.nashorn.internal.runtime.ScriptObject;
|
import jdk.nashorn.internal.runtime.ScriptObject;
|
||||||
import jdk.nashorn.internal.runtime.ScriptRuntime;
|
import jdk.nashorn.internal.runtime.ScriptRuntime;
|
||||||
import jdk.nashorn.tools.Shell;
|
import jdk.nashorn.tools.Shell;
|
||||||
@ -157,6 +159,15 @@ public final class Main extends Shell {
|
|||||||
|
|
||||||
global.addShellBuiltins();
|
global.addShellBuiltins();
|
||||||
|
|
||||||
|
// redefine readLine to use jline Console's readLine!
|
||||||
|
ScriptingFunctions.setReadLineHelper(str-> {
|
||||||
|
try {
|
||||||
|
return in.readLine(str);
|
||||||
|
} catch (final IOException ioExp) {
|
||||||
|
throw new UncheckedIOException(ioExp);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
if (System.getSecurityManager() == null) {
|
if (System.getSecurityManager() == null) {
|
||||||
final Consumer<String> evaluator = str -> {
|
final Consumer<String> evaluator = str -> {
|
||||||
// could be called from different thread (GUI), we need to handle Context set/reset
|
// could be called from different thread (GUI), we need to handle Context set/reset
|
||||||
|
32
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptingFunctions.java
32
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptingFunctions.java
@ -42,6 +42,8 @@ import java.util.Arrays;
|
|||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.Objects;
|
||||||
|
import java.util.function.Function;
|
||||||
import jdk.nashorn.internal.objects.NativeArray;
|
import jdk.nashorn.internal.objects.NativeArray;
|
||||||
import static jdk.nashorn.internal.runtime.ECMAErrors.rangeError;
|
import static jdk.nashorn.internal.runtime.ECMAErrors.rangeError;
|
||||||
|
|
||||||
@ -92,11 +94,7 @@ public final class ScriptingFunctions {
|
|||||||
* @throws IOException if an exception occurs
|
* @throws IOException if an exception occurs
|
||||||
*/
|
*/
|
||||||
public static Object readLine(final Object self, final Object prompt) throws IOException {
|
public static Object readLine(final Object self, final Object prompt) throws IOException {
|
||||||
if (prompt != UNDEFINED) {
|
return readLine(prompt);
|
||||||
System.out.print(JSType.toString(prompt));
|
|
||||||
}
|
|
||||||
final BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
|
|
||||||
return reader.readLine();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -219,6 +217,30 @@ public final class ScriptingFunctions {
|
|||||||
return outString;
|
return outString;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Implementation for pluggable "readLine" functionality
|
||||||
|
// Used by jjs interactive mode
|
||||||
|
|
||||||
|
private static Function<String, String> readLineHelper;
|
||||||
|
|
||||||
|
public static void setReadLineHelper(Function<String, String> func) {
|
||||||
|
readLineHelper = Objects.requireNonNull(func);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Function<String, String> getReadLineHelper() {
|
||||||
|
return readLineHelper;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String readLine(final Object prompt) throws IOException {
|
||||||
|
final String p = (prompt != UNDEFINED)? JSType.toString(prompt) : "";
|
||||||
|
if (readLineHelper != null) {
|
||||||
|
return readLineHelper.apply(p);
|
||||||
|
} else {
|
||||||
|
System.out.print(p);
|
||||||
|
final BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
|
||||||
|
return reader.readLine();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
|
private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
|
||||||
return MH.findStatic(MethodHandles.lookup(), ScriptingFunctions.class, name, MH.type(rtype, types));
|
return MH.findStatic(MethodHandles.lookup(), ScriptingFunctions.class, name, MH.type(rtype, types));
|
||||||
}
|
}
|
||||||
|
@ -34,6 +34,7 @@ import java.io.InputStreamReader;
|
|||||||
import java.lang.invoke.MethodHandle;
|
import java.lang.invoke.MethodHandle;
|
||||||
import java.lang.invoke.MethodHandles;
|
import java.lang.invoke.MethodHandles;
|
||||||
import jdk.nashorn.internal.runtime.JSType;
|
import jdk.nashorn.internal.runtime.JSType;
|
||||||
|
import jdk.nashorn.internal.runtime.ScriptingFunctions;
|
||||||
import jdk.nashorn.internal.objects.Global;
|
import jdk.nashorn.internal.objects.Global;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -66,11 +67,9 @@ public final class ShellFunctions {
|
|||||||
public static Object input(final Object self, final Object endMarker, final Object prompt) throws IOException {
|
public static Object input(final Object self, final Object endMarker, final Object prompt) throws IOException {
|
||||||
final String endMarkerStr = (endMarker != UNDEFINED)? JSType.toString(endMarker) : "";
|
final String endMarkerStr = (endMarker != UNDEFINED)? JSType.toString(endMarker) : "";
|
||||||
final String promptStr = (prompt != UNDEFINED)? JSType.toString(prompt) : ">> ";
|
final String promptStr = (prompt != UNDEFINED)? JSType.toString(prompt) : ">> ";
|
||||||
final BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
|
|
||||||
final StringBuilder buf = new StringBuilder();
|
final StringBuilder buf = new StringBuilder();
|
||||||
while (true) {
|
while (true) {
|
||||||
System.out.print(promptStr);
|
final String line = ScriptingFunctions.readLine(promptStr);
|
||||||
final String line = reader.readLine();
|
|
||||||
if (line == null || line.equals(endMarkerStr)) {
|
if (line == null || line.equals(endMarkerStr)) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user