From 4439582d232da5fb6d842b32337bf1255ea5bdb6 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Mon, 18 Nov 2019 18:08:33 +0100
Subject: [PATCH] Remove unnecessary update of the source roots, simplify
 interface accordingly

The update became unnecessary after the packagePartProvider fix above.
---
 .../compiler/plugin/AbstractScriptEvaluationExtension.kt      | 4 ++--
 .../scripting/compiler/plugin/JsScriptEvaluationExtension.kt  | 2 +-
 .../compiler/plugin/JvmCliScriptEvaluationExtension.kt        | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/AbstractScriptEvaluationExtension.kt b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/AbstractScriptEvaluationExtension.kt
index 2a0dd045150..00eb1bef8bc 100644
--- a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/AbstractScriptEvaluationExtension.kt
+++ b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/AbstractScriptEvaluationExtension.kt
@@ -23,7 +23,7 @@ import kotlin.script.experimental.host.toScriptSource
 
 abstract class AbstractScriptEvaluationExtension : ScriptEvaluationExtension {
 
-    abstract fun setupScriptConfiguration(configuration: CompilerConfiguration, sourcePath: String)
+    abstract fun setupScriptConfiguration(configuration: CompilerConfiguration)
 
     abstract fun createEnvironment(
         projectEnvironment: JavaCoreProjectEnvironment,
@@ -48,7 +48,7 @@ abstract class AbstractScriptEvaluationExtension : ScriptEvaluationExtension {
         }
         val sourcePath = arguments.freeArgs.first()
 
-        setupScriptConfiguration(configuration, sourcePath)
+        setupScriptConfiguration(configuration)
 
         val environment = createEnvironment(projectEnvironment, configuration)
 
diff --git a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/JsScriptEvaluationExtension.kt b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/JsScriptEvaluationExtension.kt
index 1961c136045..5f3f94e989e 100644
--- a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/JsScriptEvaluationExtension.kt
+++ b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/JsScriptEvaluationExtension.kt
@@ -42,7 +42,7 @@ fun loadScriptConfiguration(configuration: CompilerConfiguration) {
 
 class JsScriptEvaluationExtension : AbstractScriptEvaluationExtension() {
 
-    override fun setupScriptConfiguration(configuration: CompilerConfiguration, sourcePath: String) {
+    override fun setupScriptConfiguration(configuration: CompilerConfiguration) {
         loadScriptConfiguration(configuration)
     }
 
diff --git a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/JvmCliScriptEvaluationExtension.kt b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/JvmCliScriptEvaluationExtension.kt
index 6d7b7cf0795..ba6a8378cfc 100644
--- a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/JvmCliScriptEvaluationExtension.kt
+++ b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/JvmCliScriptEvaluationExtension.kt
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.scripting.compiler.plugin
 import com.intellij.core.JavaCoreProjectEnvironment
 import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
 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.KotlinCoreEnvironment
 import org.jetbrains.kotlin.config.CompilerConfiguration
@@ -27,8 +26,7 @@ class JvmCliScriptEvaluationExtension : AbstractScriptEvaluationExtension() {
         }
     }
 
-    override fun setupScriptConfiguration(configuration: CompilerConfiguration, sourcePath: String) {
-        configuration.addKotlinSourceRoot(sourcePath)
+    override fun setupScriptConfiguration(configuration: CompilerConfiguration) {
         configuration.put(JVMConfigurationKeys.RETAIN_OUTPUT_IN_MEMORY, true)
     }