Add org.jline as module to component directory #8496
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Akirathan
requested review from
4e6,
JaroslavTulach,
hubertp,
jdunkerley,
radeusgd and
GregoryTravis
as code owners
Akirathan
commented
Dec 7, 2023
Akirathan
commented
Dec 7, 2023
engine/runtime/src/main/java/org/enso/ClassLoaderConstants.java
Outdated
Show resolved
Hide resolved
Akirathan
added
CI: No changelog needed
hubertp
approved these changes
Dec 8, 2023
3 tasks
distribution/bin/enso.bat
Outdated
| @@ -6,5 +6,5 @@ if /I %%A==--dump-graphs ( | |||
| set EXTRA_OPTS=%EXTRA_OPTS% -Dgraal.Dump=Truffle:1 | |||
| ) | |||
| ) | |||
| java --module-path %comp-dir% -Dpolyglot.compiler.IterativePartialEscape=true %EXTRA_OPTS% %JAVA_OPTS% -m org.enso.runtime/org.enso.EngineRunnerBootLoader %* | |||
| java --module-path %comp-dir% --add-modules org.jline -Dpolyglot.compiler.IterativePartialEscape=true %EXTRA_OPTS% %JAVA_OPTS% -m org.enso.runtime/org.enso.EngineRunnerBootLoader %* | |||
There was a problem hiding this comment.
It'd be better to avoid these add-modules modifications. If we are sure we want to use org.jline as a module in enso, then I'd suggest to modify module-info.java to require static org.jline. Then the standard JVM launcher shall pick the org.jline module up, when it is available.
There was a problem hiding this comment.
Good idea. Let's avoid --add-modules.
|
@JaroslavTulach At the end, this PR is minimalistic - just 8 new lines. It turns out it was enough to set the thread context class loader before the jLine initialization. |
Akirathan
added
CI: Ready to merge
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #8313
Pull Request Description
Add
jlinemodule to the distribution so that our REPL is usable again.Important Notes
CTRL + R) works as expected.Checklist
Please ensure that the following checklist has been satisfied before submitting the PR:
Scala,
Java,
and
Rust
style guides. In case you are using a language not listed above, follow the Rust style guide.
./run ide build.