azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

K2, REPL: Display a warning that LV 1.9 is used for REPL in K2

Browse Source 
#KT-64384 fixed
This commit is contained in:
Ilya Chernikov
2024-03-12 10:37:58 +01:00
committed by Space Team
parent 8c6966765b
commit 0fe793943d
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/cli/LauncherReplTest.kt
+1
View File
@@ -160,6 +160,7 @@ class LauncherReplTest : TestCaseWithTmpdir() {
val replOutHeader = arrayOf( val replOutHeader = arrayOf(
null to "Welcome to Kotlin version .*", null to "Welcome to Kotlin version .*",
null to "Warning: REPL is not yet compatible with the Kotlin version .*, using '-language-version 1.9'.",
null to "Type :help for help, :quit for quit" null to "Type :help for help, :quit for quit"
) )
plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/repl/ReplFromTerminal.kt
+5 -1
View File
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
import org.jetbrains.kotlin.cli.common.messages.GroupingMessageCollector import org.jetbrains.kotlin.cli.common.messages.GroupingMessageCollector
import org.jetbrains.kotlin.cli.common.repl.ReplEvalResult import org.jetbrains.kotlin.cli.common.repl.ReplEvalResult
import org.jetbrains.kotlin.cli.common.repl.replUnescapeLineBreaks import org.jetbrains.kotlin.cli.common.repl.replUnescapeLineBreaks
import org.jetbrains.kotlin.config.CommonConfigurationKeys
import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.config.KotlinCompilerVersion import org.jetbrains.kotlin.config.KotlinCompilerVersion
import org.jetbrains.kotlin.descriptors.runtime.components.tryLoadClass import org.jetbrains.kotlin.descriptors.runtime.components.tryLoadClass
@@ -26,7 +27,7 @@ import java.util.concurrent.Future
class ReplFromTerminal( class ReplFromTerminal(
projectEnvironment: JavaCoreProjectEnvironment, projectEnvironment: JavaCoreProjectEnvironment,
compilerConfiguration: CompilerConfiguration, private val compilerConfiguration: CompilerConfiguration,
private val replConfiguration: ReplConfiguration private val replConfiguration: ReplConfiguration
) { ) {
private val replInitializer: Future<ReplInterpreter> = Executors.newSingleThreadExecutor().submit(Callable { private val replInitializer: Future<ReplInterpreter> = Executors.newSingleThreadExecutor().submit(Callable {
@@ -47,6 +48,9 @@ class ReplFromTerminal(
"Welcome to Kotlin version ${KotlinCompilerVersion.VERSION} " + "Welcome to Kotlin version ${KotlinCompilerVersion.VERSION} " +
"(JRE ${System.getProperty("java.runtime.version")})" "(JRE ${System.getProperty("java.runtime.version")})"
) )
if (compilerConfiguration.getBoolean(CommonConfigurationKeys.USE_FIR)) {
printlnWelcomeMessage("Warning: REPL is not yet compatible with the Kotlin version ${KotlinCompilerVersion.VERSION}, using '-language-version 1.9'.")
}
printlnWelcomeMessage("Type :help for help, :quit for quit") printlnWelcomeMessage("Type :help for help, :quit for quit")
} }