Console color only if JDK 22 says isConsole #10751
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
|
@som-snytt thank you! mind submitting a 2.12.x backport? |
|
@SethTisue did it work? your wish or even idle supposition is my command. |
|
@som-snytt oh we're not done yet, there are still test failures at https://github.com/scala/scala/actions/runs/8665032593 |
lrytz
reviewed
Apr 16, 2024
| // false if JDK 22 and the system console says !isTerminal | ||
| def consoleIsTerminal: Boolean = { | ||
| def isTerminal: Boolean = | ||
| try classOf[java.io.Console].getMethod("isTerminal", null).invoke(System.console).asInstanceOf[Boolean] |
There was a problem hiding this comment.
On my macOS
➜ sandbox java -version
openjdk version "22" 2024-03-19
OpenJDK Runtime Environment Temurin-22+36 (build 22+36)
OpenJDK 64-Bit Server VM Temurin-22+36 (build 22+36, mixed mode)
➜ sandbox s
> scala repl -S 2.13 -cp .
Welcome to Scala 2.13.13 (OpenJDK 64-Bit Server VM, Java 22).
Type in expressions for evaluation. Or try :help.
scala> classOf[java.io.Console].getMethod("isTerminal", null)
java.lang.NoSuchMethodException: java.io.Console.isTerminal(null)
at java.base/java.lang.Class.getMethod(Class.java:2405)
... 30 elided
lrytz
reviewed
Apr 16, 2024
| @@ -38,7 +39,7 @@ object ShellConfig { | |||
| val batchText: String = if (settings.execute.isSetByUser) settings.execute.value else "" | |||
| val batchMode: Boolean = batchText.nonEmpty | |||
| val doCompletion: Boolean = !(settings.noCompletion.value || batchMode) | |||
| val haveInteractiveConsole: Boolean = !settings.Xnojline.value | |||
| override val haveInteractiveConsole: Boolean = super.haveInteractiveConsole && !settings.Xnojline.value | |||
There was a problem hiding this comment.
This broke JLine support for me - it needs to be a lazy val due to safe init.
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.
Reverted in #10758
Color output also depends on isConsole on jdk 22