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

Set jvm target for REPL from the context module

Browse Source 
#KT-38454 fixed
This commit is contained in:
Ilya Chernikov
2020-04-20 23:27:23 +02:00
parent 87159b5428
commit b5be2abb1a
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-repl/src/org/jetbrains/kotlin/console/KotlinConsoleKeeper.kt
+7
View File
@@ -11,7 +11,10 @@ import com.intellij.openapi.module.Module
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFile
import org.jetbrains.kotlin.KotlinIdeaReplBundle import org.jetbrains.kotlin.KotlinIdeaReplBundle
import org.jetbrains.kotlin.idea.project.TargetPlatformDetector
import org.jetbrains.kotlin.idea.util.JavaParametersBuilder import org.jetbrains.kotlin.idea.util.JavaParametersBuilder
import org.jetbrains.kotlin.platform.jvm.JdkPlatform
import org.jetbrains.kotlin.platform.subplatformsOfType
import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.kotlin.utils.PathUtil
import java.io.File import java.io.File
import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.ConcurrentHashMap
@@ -67,6 +70,10 @@ class KotlinConsoleKeeper(val project: Project) {
classPath.joinToString(File.pathSeparator) classPath.joinToString(File.pathSeparator)
) )
} }
TargetPlatformDetector.getPlatform(module).subplatformsOfType<JdkPlatform>().firstOrNull()?.targetVersion?.let {
javaParameters.programParametersList.add("-jvm-target")
javaParameters.programParametersList.add(it.description)
}
} }
return javaParameters.toCommandLine() return javaParameters.toCommandLine()