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

Remove unnecessary update of the source roots, simplify interface accordingly

Browse Source 
The update became unnecessary after the packagePartProvider fix above.
This commit is contained in:
Ilya Chernikov
2019-11-18 18:08:33 +01:00
parent 02a71d2cda
commit 4439582d23
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/AbstractScriptEvaluationExtension.kt
+2 -2
View File
@@ -23,7 +23,7 @@ import kotlin.script.experimental.host.toScriptSource
abstract class AbstractScriptEvaluationExtension : ScriptEvaluationExtension { abstract class AbstractScriptEvaluationExtension : ScriptEvaluationExtension {
abstract fun setupScriptConfiguration(configuration: CompilerConfiguration, sourcePath: String) abstract fun setupScriptConfiguration(configuration: CompilerConfiguration)
abstract fun createEnvironment( abstract fun createEnvironment(
projectEnvironment: JavaCoreProjectEnvironment, projectEnvironment: JavaCoreProjectEnvironment,
@@ -48,7 +48,7 @@ abstract class AbstractScriptEvaluationExtension : ScriptEvaluationExtension {
} }
val sourcePath = arguments.freeArgs.first() val sourcePath = arguments.freeArgs.first()
setupScriptConfiguration(configuration, sourcePath) setupScriptConfiguration(configuration)
val environment = createEnvironment(projectEnvironment, configuration) val environment = createEnvironment(projectEnvironment, configuration)
plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/JsScriptEvaluationExtension.kt
+1 -1
View File
@@ -42,7 +42,7 @@ fun loadScriptConfiguration(configuration: CompilerConfiguration) {
class JsScriptEvaluationExtension : AbstractScriptEvaluationExtension() { class JsScriptEvaluationExtension : AbstractScriptEvaluationExtension() {
override fun setupScriptConfiguration(configuration: CompilerConfiguration, sourcePath: String) { override fun setupScriptConfiguration(configuration: CompilerConfiguration) {
loadScriptConfiguration(configuration) loadScriptConfiguration(configuration)
} }
plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/JvmCliScriptEvaluationExtension.kt
+1 -3
View File
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.scripting.compiler.plugin
import com.intellij.core.JavaCoreProjectEnvironment import com.intellij.core.JavaCoreProjectEnvironment
import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
import org.jetbrains.kotlin.cli.common.config.addKotlinSourceRoot
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.CompilerConfiguration
@@ -27,8 +26,7 @@ class JvmCliScriptEvaluationExtension : AbstractScriptEvaluationExtension() {
} }
} }
override fun setupScriptConfiguration(configuration: CompilerConfiguration, sourcePath: String) { override fun setupScriptConfiguration(configuration: CompilerConfiguration) {
configuration.addKotlinSourceRoot(sourcePath)
configuration.put(JVMConfigurationKeys.RETAIN_OUTPUT_IN_MEMORY, true) configuration.put(JVMConfigurationKeys.RETAIN_OUTPUT_IN_MEMORY, true)
} }