8358552: EndOfFileException in System.in.read() and IO.readln() etc. in JShell

src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java

@@ -1041,6 +1041,8 @@ private synchronized String doReadUserLine(String prompt, Character mask) throws
             return in.readLine(prompt.replace("%", "%%"), mask);
         } catch (UserInterruptException ex) {
             throw new InterruptedIOException();
+        } catch (EndOfFileException ex) {
+            return null; // Signal that Ctrl+D or similar happened
         } finally {
             in.setParser(prevParser);
             in.setHistory(prevHistory);
@@ -1051,7 +1053,11 @@ private synchronized String doReadUserLine(String prompt, Character mask) throws
 
     public char[] readPassword(String prompt) throws IOException {
         //TODO: correct behavior w.r.t. pre-read stuff?
-        return doReadUserLine(prompt, '\0').toCharArray();
+        String line = doReadUserLine(prompt, '\0');
+        if (line == null) {
+            throw new UserInterruptException("");
+        }
+        return line.toCharArray();
     }
 
     @Override

test/langtools/jdk/jshell/InputUITest.java

@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8356165
+ * @bug 8356165 8358552
  * @summary Check user input works properly
  * @modules
  *     jdk.compiler/com.sun.tools.javac.api
@@ -38,6 +38,7 @@
  * @run testng/othervm -Dstderr.encoding=UTF-8 -Dstdin.encoding=UTF-8 -Dstdout.encoding=UTF-8 InputUITest
  */
 
+import java.util.Map;
 import java.util.function.Function;
 import org.testng.annotations.Test;
 
@@ -67,4 +68,21 @@ public void testUserInputWithSurrogates() throws Exception {
         }, false);
     }
 
+    public void testCloseInputSinkWhileReadingUserInputSimulatingCtrlD() throws Exception {
+        var snippets = Map.of(
+                "System.in.read()",                 " ==> 110",
+                "System.console().reader().read()", " ==> 110",
+                "System.console().readLine()",      " ==> null",
+                "System.console().readPassword()",  " ==> null",
+                "IO.readln()",                      " ==> \"null\""
+                // TODO , "System.in.readAllBytes()", " ==> " // ... hangs forever
+            );
+        for (var snippet : snippets.entrySet()) {
+            doRunTest((inputSink, out) -> {
+                inputSink.write(snippet.getKey() + "\n");
+                inputSink.close(); // Does not work: inputSink.write("\u0004"); // CTRL + D
+                waitOutput(out, patternQuote(snippet.getValue()), patternQuote("EndOfFileException"));
+            }, false);
+        }
+    }
 }

test/langtools/jdk/jshell/UITesting.java

@@ -106,11 +106,19 @@ protected void doRunTest(Test test, boolean setUserInput) throws Exception {
         });
 
         Writer inputSink = new OutputStreamWriter(input.createOutput(), StandardCharsets.UTF_8) {
+            boolean closed = false;
             @Override
             public void write(String str) throws IOException {
+                if (closed) return; // prevents exception thrown due to closed writer
                 super.write(str);
                 flush();
             }
+
+            @Override
+            public void close() throws IOException {
+                super.close();
+                closed = true;
+            }
         };
 
         runner.start();