On Thu, 23 May 2024 17:14:19 GMT, Pavel Rappo <pra...@openjdk.org> wrote:
>> Please review this PR which introduces the `java.io.IO` top-level class and >> three methods to `java.io.Console` for [Implicitly Declared Classes and >> Instance Main Methods (Third Preview)]. >> >> This PR has been obtained as `git merge --squash` of a now obsolete [draft >> PR]. >> >> [Implicitly Declared Classes and Instance Main Methods (Third Preview)]: >> https://bugs.openjdk.org/browse/JDK-8323335 >> [draft PR]: https://github.com/openjdk/jdk/pull/18921 > > Pavel Rappo has updated the pull request with a new target base due to a > merge or a rebase. The pull request now contains 23 commits: > > - Merge branch 'master' into 8305457-Implement-java.io.IO > - Force reasonable terminal size > > JLine outputs unexpected stuff if the terminal isn't dumb and small, > such as that of our CI machines: > > if (newLines.size() > displaySize && !isTerminalDumb()) { > StringBuilder sb = new StringBuilder(">...."); > > This causes the IO test to fail with timeout, because the expected > prompt is never matched. To avoid that, we reasonably size the > terminal. > - Restructure the test > - Add diagnostic output > - Use "expect" that was found > - Merge branch 'master' into 8305457-Implement-java.io.IO > > # Conflicts: > # src/java.base/share/classes/java/io/ProxyingConsole.java > # src/java.base/share/classes/jdk/internal/io/JdkConsole.java > # src/java.base/share/classes/jdk/internal/io/JdkConsoleImpl.java > # > src/jdk.internal.le/share/classes/jdk/internal/org/jline/JdkConsoleProviderImpl.java > # src/jdk.jshell/share/classes/jdk/jshell/execution/impl/ConsoleImpl.java > - Escape prompt > - Merge branch 'master' into 8305457-Implement-java.io.IO > - Clarify input charset > - Make IO final > - ... and 13 more: https://git.openjdk.org/jdk/compare/e19a421c...258ce133 JShell-related changes look good to me. ------------- Marked as reviewed by jlahoda (Reviewer). PR Review: https://git.openjdk.org/jdk/pull/19112#pullrequestreview-2076598544
