From fb01f7be5ed29a45df67497c7bcb44d4eb1f16a8 Mon Sep 17 00:00:00 2001 From: Natalia Selezneva Date: Thu, 22 Aug 2019 12:43:59 +0300 Subject: [PATCH] Rename ScriptDependenciesManager to ScriptConfigurationManager --- .../idea/caches/project/ScriptModuleInfos.kt | 14 +++++++------- .../idea/caches/project/getModuleInfo.kt | 4 ++-- .../idea/highlighter/KotlinHighlightingUtil.kt | 4 ++-- .../kotlin/idea/util/ProjectRootsUtil.kt | 4 ++-- .../KotlinScriptDependenciesClassFinder.kt | 2 +- ...anager.kt => ScriptConfigurationManager.kt} | 11 ++++------- .../script/ScriptConfigurationManagerImpl.kt | 8 +++----- .../script/ScriptConfigurationMemoryCache.kt | 18 +++++++++--------- .../core/script/ScriptDefinitionsManager.kt | 2 +- .../ScriptTrafficLightRendererContributor.kt | 2 +- ...lassesInScriptDependenciesShortNameCache.kt | 4 ++-- ...criptDependenciesIndexableSetContributor.kt | 4 ++-- .../KotlinScriptResolveScopeProvider.kt | 4 ++-- .../ScriptDependenciesResolveScopeProvider.kt | 4 ++-- ...encySourceNavigationPolicyForJavaClasses.kt | 4 ++-- .../gradle/GradleBuildFileHighlightingTest.kt | 4 ++-- .../KotlinStandaloneScriptRunConfiguration.kt | 4 ++-- .../compile/KtScratchExecutionSession.kt | 4 ++-- .../perf/AbstractPerformanceProjectsTest.kt | 8 ++++---- .../idea/perf/PerformanceProjectsTest.kt | 4 ++-- idea/resources/META-INF/plugin-common.xml | 2 +- .../idea/inspections/UnusedSymbolInspection.kt | 4 ++-- .../introduce/AbstractExtractionTest.kt | 4 ++-- .../StandaloneScriptRunConfigurationTest.kt | 6 +++--- .../scratch/AbstractScratchRunActionTest.kt | 6 +++--- .../idea/scratch/ScratchLineMarkersTest.kt | 4 ++-- .../script/AbstractScriptConfigurationTest.kt | 2 +- 27 files changed, 68 insertions(+), 73 deletions(-) rename idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/{ScriptDependenciesManager.kt => ScriptConfigurationManager.kt} (93%) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/ScriptModuleInfos.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/ScriptModuleInfos.kt index f7188369530..bf3874eb13e 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/ScriptModuleInfos.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/ScriptModuleInfos.kt @@ -9,7 +9,7 @@ import com.intellij.openapi.project.Project import com.intellij.openapi.projectRoots.Sdk import com.intellij.openapi.vfs.VirtualFile import com.intellij.psi.search.GlobalSearchScope -import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager +import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager import org.jetbrains.kotlin.idea.core.script.dependencies.ScriptAdditionalIdeaDependenciesProvider import org.jetbrains.kotlin.idea.project.TargetPlatformDetector import org.jetbrains.kotlin.idea.stubindex.KotlinSourceFilterScope @@ -90,13 +90,13 @@ sealed class ScriptDependenciesInfo(val project: Project) : IdeaModuleInfo, Bina ) : ScriptDependenciesInfo(project) { override val sdk: Sdk? get() { - return ScriptDependenciesManager.getInstance(project).getScriptSdk(scriptFile) + return ScriptConfigurationManager.getInstance(project).getScriptSdk(scriptFile) } override fun contentScope(): GlobalSearchScope { // TODO: this is not very efficient because KotlinSourceFilterScope already checks if the files are in scripts classpath return KotlinSourceFilterScope.libraryClassFiles( - ScriptDependenciesManager.getInstance(project).getScriptDependenciesClassFilesScope(scriptFile), project + ScriptConfigurationManager.getInstance(project).getScriptDependenciesClassFilesScope(scriptFile), project ) } } @@ -105,13 +105,13 @@ sealed class ScriptDependenciesInfo(val project: Project) : IdeaModuleInfo, Bina class ForProject(project: Project) : ScriptDependenciesInfo(project) { override val sdk: Sdk? get() { - return ScriptDependenciesManager.getInstance(project).getFirstScriptsSdk() - ?: ScriptDependenciesManager.getScriptDefaultSdk(project) + return ScriptConfigurationManager.getInstance(project).getFirstScriptsSdk() + ?: ScriptConfigurationManager.getScriptDefaultSdk(project) } override fun contentScope(): GlobalSearchScope { return KotlinSourceFilterScope.libraryClassFiles( - ScriptDependenciesManager.getInstance(project).getAllScriptsDependenciesClassFilesScope(), project + ScriptConfigurationManager.getInstance(project).getAllScriptsDependenciesClassFilesScope(), project ) } } @@ -124,7 +124,7 @@ sealed class ScriptDependenciesSourceInfo(val project: Project) : IdeaModuleInfo get() = ScriptDependenciesInfo.ForProject(project) override fun sourceScope(): GlobalSearchScope = KotlinSourceFilterScope.librarySources( - ScriptDependenciesManager.getInstance(project).getAllScriptDependenciesSourcesScope(), project + ScriptConfigurationManager.getInstance(project).getAllScriptDependenciesSourcesScope(), project ) override fun hashCode() = project.hashCode() diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/getModuleInfo.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/getModuleInfo.kt index 08b06901cd5..368aa8eb796 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/getModuleInfo.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/getModuleInfo.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.asJava.elements.KtLightElement import org.jetbrains.kotlin.caches.project.cacheInvalidatingOnRootModifications import org.jetbrains.kotlin.idea.caches.lightClasses.KtLightClassForDecompiledDeclaration import org.jetbrains.kotlin.idea.core.isInTestSourceContentKotlinAware -import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager +import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager import org.jetbrains.kotlin.idea.core.script.scriptRelatedModuleName import org.jetbrains.kotlin.idea.highlighter.OutsidersPsiFileSupportUtils import org.jetbrains.kotlin.idea.util.ProjectRootsUtil @@ -240,7 +240,7 @@ private inline fun collectInfosByVirtualFile( } val isBinary = virtualFile.fileType.isKotlinBinary() - val scriptConfigurationManager = ScriptDependenciesManager.getInstance(project) + val scriptConfigurationManager = ScriptConfigurationManager.getInstance(project) if (isBinary && virtualFile in scriptConfigurationManager.getAllScriptsDependenciesClassFilesScope()) { if (treatAsLibrarySource) { onOccurrence(ScriptDependenciesSourceInfo.ForProject(project)) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightingUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightingUtil.kt index 58024055515..be7f1e9510d 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightingUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightingUtil.kt @@ -21,8 +21,8 @@ import com.intellij.psi.PsiManager import org.jetbrains.kotlin.idea.caches.project.NotUnderContentRootModuleInfo import org.jetbrains.kotlin.idea.caches.project.getModuleInfo import org.jetbrains.kotlin.idea.core.script.IdeScriptReportSink +import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager import org.jetbrains.kotlin.idea.core.script.ScriptDefinitionsManager -import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager import org.jetbrains.kotlin.idea.util.ProjectRootsUtil import org.jetbrains.kotlin.idea.util.isRunningInCidrIde import org.jetbrains.kotlin.psi.KtCodeFragment @@ -70,7 +70,7 @@ object KotlinHighlightingUtil { @Suppress("DEPRECATION") private fun shouldHighlightScript(ktFile: KtFile): Boolean { if (isRunningInCidrIde) return false // There is no Java support in CIDR. So do not highlight errors in KTS if running in CIDR. - if (!ScriptDependenciesManager.getInstance(ktFile.project).isConfigurationCached(ktFile)) return false + if (!ScriptConfigurationManager.getInstance(ktFile.project).isConfigurationCached(ktFile)) return false if (IdeScriptReportSink.getReports(ktFile).any { it.severity == ScriptDiagnostic.Severity.FATAL }) { return false } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ProjectRootsUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ProjectRootsUtil.kt index b80dc7ddf75..6133de1dd3c 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ProjectRootsUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ProjectRootsUtil.kt @@ -25,7 +25,7 @@ import com.intellij.psi.PsiDirectory import com.intellij.psi.PsiElement import com.intellij.psi.PsiFileSystemItem import org.jetbrains.kotlin.idea.KotlinModuleFileType -import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager +import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager import org.jetbrains.kotlin.idea.decompiler.builtIns.KotlinBuiltInFileType import org.jetbrains.kotlin.idea.decompiler.js.KotlinJavaScriptMetaFileType import org.jetbrains.kotlin.idea.util.application.runReadAction @@ -131,7 +131,7 @@ object ProjectRootsUtil { val canContainClassFiles = fileType == ArchiveFileType.INSTANCE || file.isDirectory val isBinary = fileType.isKotlinBinary() - val scriptConfigurationManager = if (includeScriptDependencies) ScriptDependenciesManager.getInstance(project) else null + val scriptConfigurationManager = if (includeScriptDependencies) ScriptConfigurationManager.getInstance(project) else null if (includeLibraryClasses && (isBinary || canContainClassFiles)) { if (fileIndex.isInLibraryClasses(file)) return true diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/KotlinScriptDependenciesClassFinder.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/KotlinScriptDependenciesClassFinder.kt index 86a97941ab6..fb9af4e3a1d 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/KotlinScriptDependenciesClassFinder.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/KotlinScriptDependenciesClassFinder.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.resolve.jvm.KotlinSafeClassFinder class KotlinScriptDependenciesClassFinder( private val project: Project ) : NonClasspathClassFinder(project), KotlinSafeClassFinder { - override fun calcClassRoots(): List = ScriptDependenciesManager.getInstance(project) + override fun calcClassRoots(): List = ScriptConfigurationManager.getInstance(project) .getAllScriptsDependenciesClassFiles().toList() override fun findClass(qualifiedName: String, scope: GlobalSearchScope): PsiClass? { diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesManager.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationManager.kt similarity index 93% rename from idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesManager.kt rename to idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationManager.kt index faf466e3f99..1f614e31663 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesManager.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationManager.kt @@ -39,7 +39,7 @@ import kotlin.script.experimental.api.makeFailureResult // NOTE: this service exists exclusively because ScriptDependencyManager // cannot be registered as implementing two services (state would be duplicated) class IdeScriptDependenciesProvider( - private val scriptDependenciesManager: ScriptDependenciesManager, + private val scriptConfigurationManager: ScriptConfigurationManager, project: Project ) : ScriptDependenciesProvider(project) { override fun getScriptConfigurationResult(file: KtFile): ScriptCompilationConfigurationResult? { @@ -52,7 +52,7 @@ class IdeScriptDependenciesProvider( } override fun getScriptConfiguration(file: KtFile): ScriptCompilationConfigurationWrapper? { - return scriptDependenciesManager.getConfiguration(file) + return scriptConfigurationManager.getConfiguration(file) } } @@ -106,14 +106,11 @@ interface ScriptConfigurationManager { fun getAllScriptDependenciesSourcesScope(): GlobalSearchScope fun getAllScriptsDependenciesClassFiles(): List fun getAllScriptDependenciesSources(): List -} -@Deprecated("Use ScriptConfigurationManager instead") -interface ScriptDependenciesManager : ScriptConfigurationManager { companion object { @JvmStatic - fun getInstance(project: Project): ScriptDependenciesManager = - ServiceManager.getService(project, ScriptDependenciesManager::class.java) + fun getInstance(project: Project): ScriptConfigurationManager = + ServiceManager.getService(project, ScriptConfigurationManager::class.java) fun getScriptDefaultSdk(project: Project): Sdk? { val projectSdk = ProjectRootManager.getInstance(project).projectSdk?.takeIf { it.canBeUsedForScript() } diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationManagerImpl.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationManagerImpl.kt index 99c6845b323..4d2114cffc6 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationManagerImpl.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationManagerImpl.kt @@ -19,7 +19,7 @@ import com.intellij.ui.EditorNotifications import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import org.jetbrains.annotations.TestOnly -import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager.Companion.toVfsRoots +import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager.Companion.toVfsRoots import org.jetbrains.kotlin.idea.core.script.dependencies.* import org.jetbrains.kotlin.idea.core.script.settings.KotlinScriptingSettings import org.jetbrains.kotlin.idea.core.util.EDT @@ -32,9 +32,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 -) : ScriptConfigurationManager, ScriptDependenciesManager { +class ScriptConfigurationManagerImpl internal constructor(private val project: Project) : ScriptConfigurationManager { private val rootsManager = ScriptClassRootsManager(project) private val memoryCache = ScriptConfigurationMemoryCache(project) @@ -206,7 +204,7 @@ class ScriptConfigurationManagerImpl internal constructor( * @param skipNotification forces loading new configuration even if auto reload is disabled. * @param skipSaveToAttributes skips saving to FileAttributes (used in [ScriptConfigurationFileAttributeCache] only). * - * @sample ScriptDependenciesManager.getConfiguration + * @sample ScriptConfigurationManager.getConfiguration */ private fun saveConfiguration( file: VirtualFile, diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationMemoryCache.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationMemoryCache.kt index d254bb4351b..46e4d02ca7d 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationMemoryCache.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationMemoryCache.kt @@ -78,19 +78,19 @@ class ScriptConfigurationMemoryCache internal constructor(private val project: P @Suppress("FoldInitializerAndIfToElvis") if (sdk == null) { - return@createWeakMap NonClasspathDirectoriesScope.compose(ScriptDependenciesManager.toVfsRoots(roots)) + return@createWeakMap NonClasspathDirectoriesScope.compose(ScriptConfigurationManager.toVfsRoots(roots)) } return@createWeakMap NonClasspathDirectoriesScope.compose( sdk.rootProvider.getFiles(OrderRootType.CLASSES).toList() + - ScriptDependenciesManager.toVfsRoots(roots) + ScriptConfigurationManager.toVfsRoots(roots) ) } val scriptsSdksCache: MutableMap = ConcurrentFactoryMap.createWeakMap { file -> val compilationConfiguration = getConfiguration(file) - return@createWeakMap getScriptSdk(compilationConfiguration) ?: ScriptDependenciesManager.getScriptDefaultSdk(project) + return@createWeakMap getScriptSdk(compilationConfiguration) ?: ScriptConfigurationManager.getScriptDefaultSdk(project) } private fun getConfiguration(file: VirtualFile): ScriptCompilationConfigurationWrapper? { @@ -99,7 +99,7 @@ class ScriptConfigurationMemoryCache internal constructor(private val project: P if (configuration != null) return configuration val ktFile = runReadAction { PsiManager.getInstance(project).findFile(file) as? KtFile } ?: return null - return ScriptDependenciesManager.getInstance(project).getConfiguration(ktFile) + return ScriptConfigurationManager.getInstance(project).getConfiguration(ktFile) } private fun getScriptSdk(compilationConfiguration: ScriptCompilationConfigurationWrapper?): Sdk? { @@ -139,7 +139,7 @@ class ScriptConfigurationMemoryCache internal constructor(private val project: P val scriptDependenciesClasspath = scriptDependenciesCache.getAll() .flatMap { it.value.dependenciesClassPath }.distinct() - sdkFiles + ScriptDependenciesManager.toVfsRoots(scriptDependenciesClasspath) + sdkFiles + ScriptConfigurationManager.toVfsRoots(scriptDependenciesClasspath) } val allDependenciesSources by ClearableLazyValue(cacheLock) { @@ -148,7 +148,7 @@ class ScriptConfigurationMemoryCache internal constructor(private val project: P val scriptDependenciesSources = scriptDependenciesCache.getAll() .flatMap { it.value.dependenciesSources }.distinct() - sdkSources + ScriptDependenciesManager.toVfsRoots(scriptDependenciesSources) + sdkSources + ScriptConfigurationManager.toVfsRoots(scriptDependenciesSources) } val allDependenciesClassFilesScope by ClearableLazyValue(cacheLock) { @@ -201,14 +201,14 @@ class ScriptConfigurationMemoryCache internal constructor(private val project: P } fun hasNotCachedRoots(compilationConfiguration: ScriptCompilationConfigurationWrapper): Boolean { - val scriptSdk = getScriptSdk(compilationConfiguration) ?: ScriptDependenciesManager.getScriptDefaultSdk(project) + val scriptSdk = getScriptSdk(compilationConfiguration) ?: ScriptConfigurationManager.getScriptDefaultSdk(project) val wasSdkChanged = scriptSdk != null && !allSdks.contains(scriptSdk) if (wasSdkChanged) { debug { "sdk was changed: $compilationConfiguration" } return true } - val newClassRoots = ScriptDependenciesManager.toVfsRoots(compilationConfiguration.dependenciesClassPath) + val newClassRoots = ScriptConfigurationManager.toVfsRoots(compilationConfiguration.dependenciesClassPath) for (newClassRoot in newClassRoots) { if (!allDependenciesClassFiles.contains(newClassRoot)) { debug { "class root was changed: $newClassRoot" } @@ -216,7 +216,7 @@ class ScriptConfigurationMemoryCache internal constructor(private val project: P } } - val newSourceRoots = ScriptDependenciesManager.toVfsRoots(compilationConfiguration.dependenciesSources) + val newSourceRoots = ScriptConfigurationManager.toVfsRoots(compilationConfiguration.dependenciesSources) for (newSourceRoot in newSourceRoots) { if (!allDependenciesSources.contains(newSourceRoot)) { debug { "source root was changed: $newSourceRoot" } diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt index ff120dba581..2a204a9073f 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt @@ -190,7 +190,7 @@ class ScriptDefinitionsManager(private val project: Project) : LazyScriptDefinit scriptDefinitionsCacheLock.write { scriptDefinitionsCache.clear() } // TODO: clear by script type/definition - ScriptDependenciesManager.getInstance(project).clearConfigurationCachesAndRehighlight() + ScriptConfigurationManager.getInstance(project).clearConfigurationCachesAndRehighlight() } private fun ScriptDefinitionsSource.safeGetDefinitions(): List { diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptTrafficLightRendererContributor.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptTrafficLightRendererContributor.kt index 634815799dc..aaae8fcdb74 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptTrafficLightRendererContributor.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptTrafficLightRendererContributor.kt @@ -29,7 +29,7 @@ class ScriptTrafficLightRendererContributor : TrafficLightRendererContributor { if (!ScriptDefinitionsManager.getInstance(file.project).isReady()) { status.reasonWhySuspended = "Loading kotlin script definitions" status.errorAnalyzingFinished = false - } else if (!ScriptDependenciesManager.getInstance(project).isConfigurationCached(file)) { + } else if (!ScriptConfigurationManager.getInstance(project).isConfigurationCached(file)) { status.reasonWhySuspended = "Loading kotlin script dependencies" status.errorAnalyzingFinished = false } diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/JavaClassesInScriptDependenciesShortNameCache.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/JavaClassesInScriptDependenciesShortNameCache.kt index 02e870dfe1b..f1743e57992 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/JavaClassesInScriptDependenciesShortNameCache.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/JavaClassesInScriptDependenciesShortNameCache.kt @@ -26,7 +26,7 @@ import com.intellij.psi.search.PsiShortNamesCache import com.intellij.psi.stubs.StubIndex import com.intellij.util.Processor import com.intellij.util.containers.HashSet -import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager +import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager // Allow searching java classes in jars in script dependencies, this is needed for stuff like completion and autoimport class JavaClassesInScriptDependenciesShortNameCache(private val project: Project) : PsiShortNamesCache() { @@ -35,7 +35,7 @@ class JavaClassesInScriptDependenciesShortNameCache(private val project: Project override fun getAllClassNames(dest: HashSet) {} override fun getClassesByName(name: String, scope: GlobalSearchScope): Array { - val classpathScope = ScriptDependenciesManager.getInstance(project).getAllScriptsDependenciesClassFilesScope() + val classpathScope = ScriptConfigurationManager.getInstance(project).getAllScriptsDependenciesClassFilesScope() val classes = StubIndex.getElements( JavaShortClassNameIndex.getInstance().key, name, project, classpathScope.intersectWith(scope), PsiClass::class.java ) diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/KotlinScriptDependenciesIndexableSetContributor.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/KotlinScriptDependenciesIndexableSetContributor.kt index 06a9aa29236..cecb4c19fed 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/KotlinScriptDependenciesIndexableSetContributor.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/KotlinScriptDependenciesIndexableSetContributor.kt @@ -19,12 +19,12 @@ package org.jetbrains.kotlin.idea.core.script.dependencies import com.intellij.openapi.project.Project import com.intellij.openapi.vfs.VirtualFile import com.intellij.util.indexing.IndexableSetContributor -import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager +import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager class KotlinScriptDependenciesIndexableSetContributor : IndexableSetContributor() { override fun getAdditionalProjectRootsToIndex(project: Project): Set { - val manager = ScriptDependenciesManager.getInstance(project) + val manager = ScriptConfigurationManager.getInstance(project) return (manager.getAllScriptsDependenciesClassFiles() + manager.getAllScriptDependenciesSources()).filterTo(LinkedHashSet()) { it.isValid } } diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/KotlinScriptResolveScopeProvider.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/KotlinScriptResolveScopeProvider.kt index d6a05cc26b2..c4077364084 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/KotlinScriptResolveScopeProvider.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/KotlinScriptResolveScopeProvider.kt @@ -22,7 +22,7 @@ import com.intellij.psi.PsiManager import com.intellij.psi.ResolveScopeProvider import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.idea.KotlinFileType -import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager +import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager import org.jetbrains.kotlin.idea.core.script.StandardIdeScriptDefinition import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition @@ -47,7 +47,7 @@ class KotlinScriptResolveScopeProvider : ResolveScopeProvider() { scriptDefinition.asLegacyOrNull() != null -> null scriptDefinition is ScriptDefinition.FromConfigurations || scriptDefinition.asLegacyOrNull() != null -> { GlobalSearchScope.fileScope(project, file) - .union(ScriptDependenciesManager.getInstance(project).getScriptDependenciesClassFilesScope(file)) + .union(ScriptConfigurationManager.getInstance(project).getScriptDependenciesClassFilesScope(file)) } else -> null } diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/ScriptDependenciesResolveScopeProvider.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/ScriptDependenciesResolveScopeProvider.kt index 67e200ef24c..399f557c073 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/ScriptDependenciesResolveScopeProvider.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/ScriptDependenciesResolveScopeProvider.kt @@ -23,11 +23,11 @@ import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.idea.caches.project.ScriptDependenciesInfo import org.jetbrains.kotlin.idea.caches.project.ScriptDependenciesSourceInfo import org.jetbrains.kotlin.idea.caches.project.getModuleInfoByVirtualFile -import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager +import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager class ScriptDependenciesResolveScopeProvider : ResolveScopeProvider() { override fun getResolveScope(file: VirtualFile, project: Project): GlobalSearchScope? { - if (ScriptDependenciesManager.getInstance(project).getAllScriptsDependenciesClassFiles().isEmpty()) return null + if (ScriptConfigurationManager.getInstance(project).getAllScriptsDependenciesClassFiles().isEmpty()) return null val moduleInfo = getModuleInfoByVirtualFile(project, file) ?: return null val scriptDependenciesModuleInfo = (moduleInfo as? ScriptDependenciesInfo) diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/ScriptDependencySourceNavigationPolicyForJavaClasses.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/ScriptDependencySourceNavigationPolicyForJavaClasses.kt index b9efc76987b..fcf0b3a63fc 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/ScriptDependencySourceNavigationPolicyForJavaClasses.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/ScriptDependencySourceNavigationPolicyForJavaClasses.kt @@ -21,7 +21,7 @@ import com.intellij.psi.PsiClassOwner import com.intellij.psi.PsiElement import com.intellij.psi.impl.compiled.* import com.intellij.psi.util.MethodSignatureUtil -import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager +import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager class ScriptDependencySourceNavigationPolicyForJavaClasses : ClsCustomNavigationPolicyEx() { override fun getNavigationElement(clsClass: ClsClassImpl): PsiClass? { @@ -49,7 +49,7 @@ class ScriptDependencySourceNavigationPolicyForJavaClasses : ClsCustomNavigation val virtualFile = file.virtualFile val project = file.project - val kotlinScriptConfigurationManager = ScriptDependenciesManager.getInstance(project) + val kotlinScriptConfigurationManager = ScriptConfigurationManager.getInstance(project) if (virtualFile !in kotlinScriptConfigurationManager.getAllScriptsDependenciesClassFilesScope()) return null val sourceFileName = (file.classes.first() as ClsClassImpl).sourceFileName diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleBuildFileHighlightingTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleBuildFileHighlightingTest.kt index 9f9a85433a9..e42609d4e00 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleBuildFileHighlightingTest.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleBuildFileHighlightingTest.kt @@ -10,7 +10,7 @@ import com.intellij.psi.PsiManager import org.jetbrains.kotlin.diagnostics.Severity import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages import org.jetbrains.kotlin.idea.caches.resolve.analyzeWithContent -import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager +import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.plugins.gradle.tooling.annotation.TargetVersions @@ -48,7 +48,7 @@ class GradleBuildFileHighlightingTest : GradleImportingTestCase() { val psiFile = PsiManager.getInstance(myProject).findFile(file) as? KtFile ?: error("Couldn't find psiFile for virtual file: ${file.canonicalPath}") - ScriptDependenciesManager.updateScriptDependenciesSynchronously(psiFile, myProject) + ScriptConfigurationManager.updateScriptDependenciesSynchronously(psiFile, myProject) val bindingContext = psiFile.analyzeWithContent() diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/script/standalone/KotlinStandaloneScriptRunConfiguration.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/script/standalone/KotlinStandaloneScriptRunConfiguration.kt index f3b2af4bdef..32fd280817b 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/script/standalone/KotlinStandaloneScriptRunConfiguration.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/script/standalone/KotlinStandaloneScriptRunConfiguration.kt @@ -38,7 +38,7 @@ import com.intellij.psi.PsiElement import com.intellij.refactoring.listeners.RefactoringElementAdapter import com.intellij.refactoring.listeners.RefactoringElementListener import org.jdom.Element -import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager +import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager import org.jetbrains.kotlin.idea.run.JavaRunConfigurationExtensionManagerUtil import org.jetbrains.kotlin.idea.run.KotlinRunConfiguration import org.jetbrains.kotlin.idea.run.script.standalone.KotlinStandaloneScriptRunConfigurationProducer.Companion.pathFromPsiElement @@ -206,7 +206,7 @@ private class ScriptCommandLineState( params.classPath.add(PathUtil.kotlinPathsForIdeaPlugin.compilerPath) - val scriptClasspath = ScriptDependenciesManager.getInstance(environment.project).getScriptClasspath(scriptVFile) + val scriptClasspath = ScriptConfigurationManager.getInstance(environment.project).getScriptClasspath(scriptVFile) scriptClasspath.forEach { params.classPath.add(it.presentableUrl) } diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/compile/KtScratchExecutionSession.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/compile/KtScratchExecutionSession.kt index eabf5a8f0ea..298d21988f0 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/compile/KtScratchExecutionSession.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/compile/KtScratchExecutionSession.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.codegen.filterClassFiles import org.jetbrains.kotlin.codegen.state.GenerationState import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade -import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager +import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager import org.jetbrains.kotlin.idea.debugger.DebuggerUtils import org.jetbrains.kotlin.idea.scratch.LOG import org.jetbrains.kotlin.idea.scratch.ScratchExpression @@ -164,7 +164,7 @@ class KtScratchExecutionSession( javaParameters.classPath.addAll(JavaParametersBuilder.getModuleDependencies(module)) } - ScriptDependenciesManager.getInstance(originalFile.project) + ScriptConfigurationManager.getInstance(originalFile.project) .getConfiguration(originalFile)?.let { javaParameters.classPath.addAll(it.dependenciesClassPath.map { f -> f.absolutePath }) } diff --git a/idea/performanceTests/org/jetbrains/kotlin/idea/perf/AbstractPerformanceProjectsTest.kt b/idea/performanceTests/org/jetbrains/kotlin/idea/perf/AbstractPerformanceProjectsTest.kt index e2f647b0a42..19066570f0a 100644 --- a/idea/performanceTests/org/jetbrains/kotlin/idea/perf/AbstractPerformanceProjectsTest.kt +++ b/idea/performanceTests/org/jetbrains/kotlin/idea/perf/AbstractPerformanceProjectsTest.kt @@ -65,8 +65,8 @@ import com.intellij.util.io.exists import com.intellij.xml.XmlSchemaProvider import org.jetbrains.kotlin.idea.KotlinLanguage import org.jetbrains.kotlin.idea.configuration.getModulesWithKotlinFiles +import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager import org.jetbrains.kotlin.idea.core.script.ScriptDefinitionsManager -import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager import org.jetbrains.kotlin.idea.core.script.settings.KotlinScriptingSettings import org.jetbrains.kotlin.idea.core.util.toPsiFile import org.jetbrains.kotlin.idea.framework.KotlinSdkType @@ -327,7 +327,7 @@ abstract class AbstractPerformanceProjectsTest : UsefulTestCase() { val initialText = editor.document.text try { if (isAKotlinScriptFile(fileName)) { - ScriptDependenciesManager.updateScriptDependenciesSynchronously(virtualFile, project) + ScriptConfigurationManager.updateScriptDependenciesSynchronously(fileInEditor.psiFile, project) } val tasksIdx = fileInEditor.document.text.indexOf(marker) @@ -402,7 +402,7 @@ abstract class AbstractPerformanceProjectsTest : UsefulTestCase() { val initialText = editor.document.text if (isAKotlinScriptFile(fileName)) { runAndMeasure("update script dependencies for $fileName") { - ScriptDependenciesManager.updateScriptDependenciesSynchronously(virtualFile, project) + ScriptConfigurationManager.updateScriptDependenciesSynchronously(file, project) } } @@ -588,7 +588,7 @@ abstract class AbstractPerformanceProjectsTest : UsefulTestCase() { testName = "updateScriptDependencies ${notePrefix(note)}${simpleFilename(fileName)}", setUp = { it.setUpValue = openFileInEditor(project, fileName) }, test = { - ScriptDependenciesManager.updateScriptDependenciesSynchronously(it.setUpValue!!.psiFile.virtualFile, project) + ScriptConfigurationManager.updateScriptDependenciesSynchronously(it.setUpValue!!.psiFile, project) it.value = it.setUpValue }, tearDown = { diff --git a/idea/performanceTests/org/jetbrains/kotlin/idea/perf/PerformanceProjectsTest.kt b/idea/performanceTests/org/jetbrains/kotlin/idea/perf/PerformanceProjectsTest.kt index 546a12f6f9b..6e3849137a4 100644 --- a/idea/performanceTests/org/jetbrains/kotlin/idea/perf/PerformanceProjectsTest.kt +++ b/idea/performanceTests/org/jetbrains/kotlin/idea/perf/PerformanceProjectsTest.kt @@ -12,7 +12,7 @@ import com.intellij.openapi.project.Project import com.intellij.openapi.util.Disposer import com.intellij.psi.PsiElement import com.intellij.testFramework.propertyBased.MadTestingUtil -import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager +import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager import org.jetbrains.kotlin.idea.highlighter.KotlinPsiChecker import org.jetbrains.kotlin.idea.highlighter.KotlinPsiCheckerAndHighlightingUpdater import org.jetbrains.kotlin.idea.testFramework.Fixture @@ -260,7 +260,7 @@ class PerformanceProjectsTest : AbstractPerformanceProjectsTest() { // Note: Kotlin scripts require dependencies to be loaded if (isAKotlinScriptFile(fileName)) { - ScriptDependenciesManager.updateScriptDependenciesSynchronously(fileInEditor.psiFile.virtualFile, project) + ScriptConfigurationManager.updateScriptDependenciesSynchronously(fileInEditor.psiFile, project) } resetTimestamp() diff --git a/idea/resources/META-INF/plugin-common.xml b/idea/resources/META-INF/plugin-common.xml index 66439b25e51..7d3f3bbc096 100644 --- a/idea/resources/META-INF/plugin-common.xml +++ b/idea/resources/META-INF/plugin-common.xml @@ -296,7 +296,7 @@ -