8247403: JShell: No custom input (e.g. from GUI) possible with JavaShellToolBuilder #2509

lahodaj · 2021-02-10T13:55:24Z

Basically, JShell's ConsoleIOContext always uses the JLine's default terminal, which uses System.in, or equivalent, for input. But, if the JShell tool has been created using JavaShellToolBuilder, a different input might have been provided. The proposed solution is to use a different JLine's terminal in this case, based on the provided input.

Progress

Change must not contain extraneous whitespace
Commit message must refer to an issue
Change must be properly reviewed

Issue

JDK-8247403: JShell: No custom input (e.g. from GUI) possible with JavaShellToolBuilder

Reviewers

Vicente Romero (@vicente-romero-oracle - Reviewer) ⚠️ Review applies to d7eacd6

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/2509/head:pull/2509
$ git checkout pull/2509

Update a local copy of the PR:
$ git checkout pull/2509
$ git pull https://git.openjdk.java.net/jdk pull/2509/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2509

View PR using the GUI difftool:
$ git pr show -t 2509

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/2509.diff

…ellToolBuilder

bridgekeeper · 2021-02-10T13:55:36Z

👋 Welcome back jlahoda! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2021-02-10T13:57:13Z

@lahodaj The following label will be automatically applied to this pull request:

kulla

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

mlbridge · 2021-02-10T14:00:51Z

Webrevs

vicente-romero-oracle

LGTM

openjdk · 2021-04-12T21:00:37Z

@lahodaj This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8247403: JShell: No custom input (e.g. from GUI) possible with JavaShellToolBuilder

Reviewed-by: vromero

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 676 new commits pushed to the master branch:

ac36b7d: 8267452: Delegate forEachRemaining in Spliterators.iterator()
d0d2ddc: 8267651: runtime/handshake/HandshakeTimeoutTest.java times out when dumping core
a98e476: 8267311: vmTestbase/gc/gctests/StringInternGC/StringInternGC.java eventually OOMEs
5aa45f2: 8267403: tools/jpackage/share/FileAssociationsTest.java#id0 failed with "Error: Bundler "Mac PKG Package" (pkg) failed to produce a package"
c20ca42: 8267691: Change table to obsolete CriticalJNINatives in JDK 18, not 17
e751b7b: 8267683: rfc7301Grease8F value not displayed correctly in SSLParameters javadoc
0b77359: 8224243: Add implSpec's to AccessibleObject and seal Executable
594d454: 8267574: Dead code in HtmlStyle/HtmlDocletWriter
2ef2450: 8263445: Duplicate key compiler.err.expected.module in compiler.properties
cc687fd: 8267575: Add new documentation group in HtmlStyle
... and 666 more: https://git.openjdk.java.net/jdk/compare/e2106d5af6244a9394be10106619ea5ac3262a9a...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

… sent to the output stream more consistent with the legacy behavior.

…the output terminal size.

lahodaj · 2021-04-26T11:41:46Z

It turned out some users/clients of JavaShellToolBuilder do not attach a full terminal to it, but rather parse the output, and since we have changed the output by using a newer JLine, this became more complicated. So the new iteration of the patch supports two modes: a (default) simpler mode, which does not use escape sequences much, and a more for real terminals, where JShell will use escape sequences to provide a good experiment to a user reading on the terminal. Please also see the associated CSR:
https://bugs.openjdk.java.net/browse/JDK-8265966

vicente-romero-oracle · 2021-05-21T14:07:38Z

/csr

openjdk · 2021-05-21T14:19:29Z

@vicente-romero-oracle this pull request will not be integrated until the CSR request JDK-8265966 for issue JDK-8247403 has been approved.

vicente-romero-oracle · 2021-05-21T14:24:01Z

in the CSR and in the new method spec, please consider adding in the @implSpec section a mention to that the provided default implementation does something in the lines of:

The default implementation of this method returns {@code this}.

apart from this I think the patch is good to go

lahodaj · 2021-05-31T09:24:12Z

/integrate

openjdk · 2021-05-31T09:25:42Z

@lahodaj Since your change was applied there have been 728 commits pushed to the master branch:

64f0f68: 8267464: Circular-dependency resilient inline headers
ab5a7ff: 8267587: Update java.util to use enhanced switch
35916ed: 8267806: C1: Relax inlining checks for not yet initialized classes
1e29005: 8267842: SIGSEGV in get_current_contended_monitor
236bd89: 8263583: Emoji rendering on macOS
1ab2776: 8247608: Javadoc: CSS margin is not applied consistently
9031477: 8267945: ZGC: Revert NUMA changes (JDK-8266217 and JDK-8241354) after JDK-8241423
6627432: 8267953: restore 'volatile' to ObjectMonitor::_owner field
964bac9: 8267706: bin/idea.sh tries to use cygpath on WSL
591b0c3: 8264624: change the guarantee() calls added by JDK-8264123 to assert() calls
... and 718 more: https://git.openjdk.java.net/jdk/compare/e2106d5af6244a9394be10106619ea5ac3262a9a...master

Your commit was automatically rebased without conflicts.

Pushed as commit 2c8e94f.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

archiecobbs · 2023-05-06T15:25:19Z

src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/LineReaderImpl.java

@@ -4157,7 +4157,7 @@ private AttributedString expandPromptPattern(String pattern, int padToWidth,
            } else
                sb.append(ch);
        }
-        if (padToWidth > cols) {


Random blast-from-the-past question: would it be appropriate to submit this change back to the jline project? It doesn't appear to be in the current jline3 master.

8247403: JShell: No custom input (e.g. from GUI) possible with JavaSh…

96c4430

…ellToolBuilder

openjdk bot added the rfr Pull request is ready for review label Feb 10, 2021

openjdk bot added the kulla kulla-dev@openjdk.org label Feb 10, 2021

Merge branch 'master' into JDK-8247404

088586e

vicente-romero-oracle approved these changes Apr 12, 2021

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Apr 12, 2021

lahodaj added 6 commits April 14, 2021 12:44

When using JavaShellToolBuilder programmatically, make the characters…

d2ea269

… sent to the output stream more consistent with the legacy behavior.

Merge branch 'master' into JDK-8247404

a8f9060

Adding an experimental API to select the JavaShell output format and …

3215374

…the output terminal size.

Cleanup.

4bf4af3

Improving test.

160cd3c

Restoring timeout.

d7eacd6

openjdk bot added the csr Pull request needs approved CSR before integration label May 21, 2021

openjdk bot removed the ready Pull request is ready to be integrated label May 21, 2021

vicente-romero-oracle approved these changes May 21, 2021

View reviewed changes

Adding note about the default behavior, as suggested.

6ee9855

openjdk bot added ready Pull request is ready to be integrated and removed csr Pull request needs approved CSR before integration labels May 26, 2021

openjdk bot closed this May 31, 2021

openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated labels May 31, 2021

openjdk bot removed the rfr Pull request is ready for review label May 31, 2021

archiecobbs reviewed May 6, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8247403: JShell: No custom input (e.g. from GUI) possible with JavaShellToolBuilder #2509

8247403: JShell: No custom input (e.g. from GUI) possible with JavaShellToolBuilder #2509

lahodaj commented Feb 10, 2021 •

edited by openjdk bot

Loading

bridgekeeper bot commented Feb 10, 2021

openjdk bot commented Feb 10, 2021

mlbridge bot commented Feb 10, 2021 •

edited

Loading

vicente-romero-oracle left a comment

openjdk bot commented Apr 12, 2021 •

edited

Loading

lahodaj commented Apr 26, 2021

vicente-romero-oracle commented May 21, 2021

openjdk bot commented May 21, 2021

vicente-romero-oracle commented May 21, 2021 •

edited

Loading

lahodaj commented May 31, 2021

openjdk bot commented May 31, 2021

archiecobbs May 6, 2023

8247403: JShell: No custom input (e.g. from GUI) possible with JavaShellToolBuilder #2509

8247403: JShell: No custom input (e.g. from GUI) possible with JavaShellToolBuilder #2509

Conversation

lahodaj commented Feb 10, 2021 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Feb 10, 2021

openjdk bot commented Feb 10, 2021

mlbridge bot commented Feb 10, 2021 • edited Loading

Webrevs

vicente-romero-oracle left a comment

Choose a reason for hiding this comment

openjdk bot commented Apr 12, 2021 • edited Loading

lahodaj commented Apr 26, 2021

vicente-romero-oracle commented May 21, 2021

openjdk bot commented May 21, 2021

vicente-romero-oracle commented May 21, 2021 • edited Loading

lahodaj commented May 31, 2021

openjdk bot commented May 31, 2021

archiecobbs May 6, 2023

Choose a reason for hiding this comment

lahodaj commented Feb 10, 2021 •

edited by openjdk bot

Loading

mlbridge bot commented Feb 10, 2021 •

edited

Loading

openjdk bot commented Apr 12, 2021 •

edited

Loading

vicente-romero-oracle commented May 21, 2021 •

edited

Loading