From 1012a24afcad8a1b964dacf3a67823d008daeaa9 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 20 Jun 2017 17:53:04 +0300 Subject: [PATCH] Refactor: move KotlinScriptExternalImportsProviderImpl to 'cli' module --- .../script/KotlinScriptExternalImportsProviderImpl.kt | 5 ++++- .../kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) rename compiler/{frontend.script/src/org/jetbrains/kotlin => cli/src/org/jetbrains/kotlin/cli/common}/script/KotlinScriptExternalImportsProviderImpl.kt (89%) diff --git a/compiler/frontend.script/src/org/jetbrains/kotlin/script/KotlinScriptExternalImportsProviderImpl.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/common/script/KotlinScriptExternalImportsProviderImpl.kt similarity index 89% rename from compiler/frontend.script/src/org/jetbrains/kotlin/script/KotlinScriptExternalImportsProviderImpl.kt rename to compiler/cli/src/org/jetbrains/kotlin/cli/common/script/KotlinScriptExternalImportsProviderImpl.kt index f6208b6c469..5aed9363c2f 100644 --- a/compiler/frontend.script/src/org/jetbrains/kotlin/script/KotlinScriptExternalImportsProviderImpl.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/script/KotlinScriptExternalImportsProviderImpl.kt @@ -14,11 +14,14 @@ * limitations under the License. */ -package org.jetbrains.kotlin.script +package org.jetbrains.kotlin.cli.common.script import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.project.Project import com.intellij.openapi.vfs.VirtualFile +import org.jetbrains.kotlin.script.KotlinScriptDefinitionProvider +import org.jetbrains.kotlin.script.KotlinScriptExternalImportsProvider +import org.jetbrains.kotlin.script.KotlinScriptExternalImportsProviderBase import java.io.File import java.util.concurrent.locks.ReentrantReadWriteLock import kotlin.concurrent.read diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt index 57f8009083c..bd2af04ef33 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt @@ -104,7 +104,7 @@ import org.jetbrains.kotlin.resolve.lazy.declarations.CliDeclarationProviderFact import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactoryService import org.jetbrains.kotlin.script.KotlinScriptDefinitionProvider import org.jetbrains.kotlin.script.KotlinScriptExternalImportsProvider -import org.jetbrains.kotlin.script.KotlinScriptExternalImportsProviderImpl +import org.jetbrains.kotlin.cli.common.script.KotlinScriptExternalImportsProviderImpl import org.jetbrains.kotlin.utils.PathUtil import java.io.File