diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationManager.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationManager.kt index e59bb19ddf3..79899237894 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationManager.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationManager.kt @@ -28,7 +28,7 @@ import com.intellij.psi.search.GlobalSearchScope import com.intellij.util.io.URLUtil import org.jetbrains.annotations.TestOnly import org.jetbrains.kotlin.idea.caches.project.getAllProjectSdks -import org.jetbrains.kotlin.idea.core.script.configuration.ScriptConfigurationManagerImpl +import org.jetbrains.kotlin.idea.core.script.configuration.DefaultScriptConfigurationManager import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.scripting.definitions.ScriptDependenciesProvider import org.jetbrains.kotlin.scripting.resolve.ScriptCompilationConfigurationResult @@ -146,7 +146,7 @@ interface ScriptConfigurationManager { @TestOnly fun updateScriptDependenciesSynchronously(file: PsiFile, project: Project) { - (getInstance(project) as ScriptConfigurationManagerImpl).updateScriptDependenciesSynchronously(file) + (getInstance(project) as DefaultScriptConfigurationManager).updateScriptDependenciesSynchronously(file) } } } diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/ScriptConfigurationManagerImpl.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/DefaultScriptConfigurationManager.kt similarity index 99% rename from idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/ScriptConfigurationManagerImpl.kt rename to idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/DefaultScriptConfigurationManager.kt index 7386d8e584a..354c66a0c22 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/ScriptConfigurationManagerImpl.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/DefaultScriptConfigurationManager.kt @@ -43,7 +43,7 @@ import org.jetbrains.kotlin.scripting.resolve.ScriptReportSink import kotlin.script.experimental.api.ScriptDiagnostic import kotlin.script.experimental.api.valueOrNull -class ScriptConfigurationManagerImpl internal constructor(private val project: Project) : +class DefaultScriptConfigurationManager internal constructor(private val project: Project) : ScriptConfigurationManager { private val rootsManager = ScriptClassRootsManager(project) diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/cache/ScriptConfigurationFileAttributeCache.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/cache/ScriptConfigurationFileAttributeCache.kt index 01cc0367d2a..e1225b98e8e 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/cache/ScriptConfigurationFileAttributeCache.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/cache/ScriptConfigurationFileAttributeCache.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.idea.core.script.configuration.cache import com.intellij.openapi.vfs.VirtualFile -import org.jetbrains.kotlin.idea.core.script.configuration.loader.ScriptDependenciesLoader +import org.jetbrains.kotlin.idea.core.script.configuration.loader.ScriptConfigurationLoader import org.jetbrains.kotlin.idea.core.script.debug import org.jetbrains.kotlin.idea.core.util.* import org.jetbrains.kotlin.psi.KtFile @@ -22,7 +22,7 @@ import kotlin.script.experimental.api.asSuccess import kotlin.script.experimental.dependencies.ScriptDependencies class ScriptConfigurationFileAttributeCache : - ScriptDependenciesLoader { + ScriptConfigurationLoader { operator fun contains(file: VirtualFile): Boolean = file.scriptDependencies != null || file.scriptCompilationConfiguration != null diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/listener/ScriptsListener.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/listener/ScriptChangesNotifier.kt similarity index 94% rename from idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/listener/ScriptsListener.kt rename to idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/listener/ScriptChangesNotifier.kt index 3a86af46671..74dbb302824 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/listener/ScriptsListener.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/listener/ScriptChangesNotifier.kt @@ -17,15 +17,15 @@ import com.intellij.openapi.project.Project import com.intellij.openapi.vfs.VirtualFile import com.intellij.psi.PsiManager import com.intellij.util.Alarm -import org.jetbrains.kotlin.idea.core.script.configuration.ScriptConfigurationManagerImpl +import org.jetbrains.kotlin.idea.core.script.configuration.DefaultScriptConfigurationManager import org.jetbrains.kotlin.idea.core.script.isScriptDependenciesUpdaterDisabled import org.jetbrains.kotlin.idea.util.ProjectRootsUtil import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.scripting.definitions.isNonScript -class ScriptsListener( +class ScriptChangesNotifier( private val project: Project, - private val scriptsManager: ScriptConfigurationManagerImpl + private val scriptsManager: DefaultScriptConfigurationManager ) { private val scriptsQueue = Alarm(Alarm.ThreadToUse.SWING_THREAD, project) private val scriptChangesListenerDelay = 1400 diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/loader/FromRefinedConfigurationLoader.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/loader/DefaultScriptConfigurationLoader.kt similarity index 94% rename from idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/loader/FromRefinedConfigurationLoader.kt rename to idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/loader/DefaultScriptConfigurationLoader.kt index 348fbce6344..34586c7fc95 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/loader/FromRefinedConfigurationLoader.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/loader/DefaultScriptConfigurationLoader.kt @@ -15,8 +15,8 @@ import org.jetbrains.kotlin.scripting.resolve.ScriptCompilationConfigurationResu import org.jetbrains.kotlin.scripting.resolve.refineScriptCompilationConfiguration import kotlin.script.experimental.dependencies.AsyncDependenciesResolver -class FromRefinedConfigurationLoader internal constructor() : - ScriptDependenciesLoader { +class DefaultScriptConfigurationLoader internal constructor() : + ScriptConfigurationLoader { override fun isAsync(file: KtFile, scriptDefinition: ScriptDefinition): Boolean { return scriptDefinition.asLegacyOrNull()?.dependencyResolver?.let { it is AsyncDependenciesResolver || it is LegacyResolverWrapper diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/loader/ScriptDependenciesLoader.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/loader/ScriptConfigurationLoader.kt similarity index 88% rename from idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/loader/ScriptDependenciesLoader.kt rename to idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/loader/ScriptConfigurationLoader.kt index 9eee0129beb..ae5c2c75ba2 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/loader/ScriptDependenciesLoader.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/loader/ScriptConfigurationLoader.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition import org.jetbrains.kotlin.scripting.resolve.ScriptCompilationConfigurationResult // TODO: rename - this is not only about dependencies anymore -internal interface ScriptDependenciesLoader { +internal interface ScriptConfigurationLoader { fun isAsync(file: KtFile, scriptDefinition: ScriptDefinition) = false val skipSaveToAttributes: Boolean diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/loader/OutsiderFileDependenciesLoader.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/loader/ScriptOutsiderFileConfigurationLoader.kt similarity index 85% rename from idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/loader/OutsiderFileDependenciesLoader.kt rename to idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/loader/ScriptOutsiderFileConfigurationLoader.kt index ad12aeee2f9..452560ea83a 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/loader/OutsiderFileDependenciesLoader.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/loader/ScriptOutsiderFileConfigurationLoader.kt @@ -6,15 +6,15 @@ package org.jetbrains.kotlin.idea.core.script.configuration.loader import com.intellij.psi.PsiManager -import org.jetbrains.kotlin.idea.core.script.configuration.ScriptConfigurationManagerImpl +import org.jetbrains.kotlin.idea.core.script.configuration.DefaultScriptConfigurationManager import org.jetbrains.kotlin.idea.highlighter.OutsidersPsiFileSupportUtils import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition import org.jetbrains.kotlin.scripting.resolve.ScriptCompilationConfigurationResult import kotlin.script.experimental.api.asSuccess -class OutsiderFileDependenciesLoader(private val manager: ScriptConfigurationManagerImpl) : - ScriptDependenciesLoader { +class ScriptOutsiderFileConfigurationLoader(private val manager: DefaultScriptConfigurationManager) : + ScriptConfigurationLoader { override val skipSaveToAttributes: Boolean get() = true diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/utils/BackgroundLoader.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/utils/BackgroundExecutor.kt similarity index 97% rename from idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/utils/BackgroundLoader.kt rename to idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/utils/BackgroundExecutor.kt index b0667e44776..54f165cd666 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/utils/BackgroundLoader.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/utils/BackgroundExecutor.kt @@ -14,9 +14,9 @@ import org.jetbrains.kotlin.idea.core.script.settings.KotlinScriptingSettings import org.jetbrains.kotlin.psi.KtFile import java.util.concurrent.ConcurrentLinkedQueue -internal class BackgroundLoader( +internal class BackgroundExecutor( private val project: Project, - private val rootsManager: ScriptClassRootsManager, + private val rootsManager: ScriptClassRootsIndexer, private val loadDependencies: (KtFile) -> Unit ) { private var task: Task? = null diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/utils/ScriptClassRootsManager.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/utils/ScriptClassRootsIndexer.kt similarity index 98% rename from idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/utils/ScriptClassRootsManager.kt rename to idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/utils/ScriptClassRootsIndexer.kt index 75f4ad42093..d637b7c91fc 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/utils/ScriptClassRootsManager.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/utils/ScriptClassRootsIndexer.kt @@ -21,7 +21,7 @@ import java.util.concurrent.atomic.AtomicInteger /** * Utility for postponing indexing of new roots at the end of some bulk operation. */ -internal class ScriptClassRootsManager(val project: Project) { +internal class ScriptClassRootsIndexer(val project: Project) { private var newRootsPresent: Boolean = false private val concurrentTransactions = AtomicInteger() diff --git a/idea/resources/META-INF/plugin-common.xml b/idea/resources/META-INF/plugin-common.xml index 2cfa90b71e4..47863477335 100644 --- a/idea/resources/META-INF/plugin-common.xml +++ b/idea/resources/META-INF/plugin-common.xml @@ -308,7 +308,7 @@ serviceImplementation="org.jetbrains.kotlin.idea.core.script.IdeScriptDependenciesProvider"/> + serviceImplementation="org.jetbrains.kotlin.idea.core.script.configuration.DefaultScriptConfigurationManager"/>