Skip to content

Commit 999c3c5

Browse files
PVTalanovPVTalanov
committed
Rename services related to script dependencies
KotlinScriptConfigurationManager -> ScriptDependenciesManager KotlinScriptExternalImportsProvider -> ScriptDependenciesProvider
1 parent 96db16a commit 999c3c5

File tree

17 files changed

+55
-55
lines changed

17 files changed

+55
-55
lines changed

‎compiler/cli/src/org/jetbrains/kotlin/cli/common/script/KotlinScriptExternalImportsProviderImpl.kt‎ renamed to ‎compiler/cli/src/org/jetbrains/kotlin/cli/common/script/CliScriptDependenciesProvider.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@ import com.intellij.openapi.diagnostic.Logger
2020
import com.intellij.openapi.project.Project
2121
import com.intellij.openapi.vfs.VirtualFile
2222
import org.jetbrains.kotlin.script.KotlinScriptDefinitionProvider
23-
import org.jetbrains.kotlin.script.KotlinScriptExternalImportsProvider
23+
import org.jetbrains.kotlin.script.ScriptDependenciesProvider
2424
import org.jetbrains.kotlin.script.ScriptContentLoader
2525
import java.io.File
2626
import java.util.concurrent.locks.ReentrantReadWriteLock
2727
import kotlin.concurrent.read
2828
import kotlin.concurrent.write
2929
import kotlin.script.dependencies.ScriptDependencies
3030

31-
class KotlinScriptExternalImportsProviderImpl(
31+
class CliScriptDependenciesProvider(
3232
project: Project,
3333
private val scriptDefinitionProvider: KotlinScriptDefinitionProvider
34-
) : KotlinScriptExternalImportsProvider {
34+
) : ScriptDependenciesProvider {
3535

3636
private val cacheLock = ReentrantReadWriteLock()
3737
private val cache = hashMapOf<String, ScriptDependencies?>()
@@ -63,4 +63,4 @@ class KotlinScriptExternalImportsProviderImpl(
6363
}
6464
}
6565

66-
private val log = Logger.getInstance(KotlinScriptExternalImportsProvider::class.java)
66+
private val log = Logger.getInstance(ScriptDependenciesProvider::class.java)

‎compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.ERROR
7575
import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.STRONG_WARNING
7676
import org.jetbrains.kotlin.cli.common.messages.MessageCollector
7777
import org.jetbrains.kotlin.cli.common.script.CliScriptReportSink
78-
import org.jetbrains.kotlin.cli.common.script.KotlinScriptExternalImportsProviderImpl
78+
import org.jetbrains.kotlin.cli.common.script.CliScriptDependenciesProvider
7979
import org.jetbrains.kotlin.cli.common.toBooleanLenient
8080
import org.jetbrains.kotlin.cli.jvm.JvmRuntimeVersionsConsistencyChecker
8181
import org.jetbrains.kotlin.cli.jvm.config.*
@@ -106,7 +106,7 @@ import org.jetbrains.kotlin.resolve.jvm.modules.JavaModuleResolver
106106
import org.jetbrains.kotlin.resolve.lazy.declarations.CliDeclarationProviderFactoryService
107107
import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactoryService
108108
import org.jetbrains.kotlin.script.KotlinScriptDefinitionProvider
109-
import org.jetbrains.kotlin.script.KotlinScriptExternalImportsProvider
109+
import org.jetbrains.kotlin.script.ScriptDependenciesProvider
110110
import org.jetbrains.kotlin.script.ScriptReportSink
111111
import org.jetbrains.kotlin.utils.PathUtil
112112
import java.io.File
@@ -189,7 +189,7 @@ class KotlinCoreEnvironment private constructor(
189189
scriptDefinitionProvider.setScriptDefinitions(
190190
configuration.getList(JVMConfigurationKeys.SCRIPT_DEFINITIONS))
191191

192-
KotlinScriptExternalImportsProvider.getInstance(project).let { importsProvider ->
192+
ScriptDependenciesProvider.getInstance(project).let { importsProvider ->
193193
configuration.addJvmClasspathRoots(
194194
sourceFiles.mapNotNull(importsProvider::getScriptDependencies)
195195
.flatMap { it.classpath }
@@ -523,7 +523,7 @@ class KotlinCoreEnvironment private constructor(
523523
with (projectEnvironment.project) {
524524
val kotlinScriptDefinitionProvider = KotlinScriptDefinitionProvider()
525525
registerService(KotlinScriptDefinitionProvider::class.java, kotlinScriptDefinitionProvider)
526-
registerService(KotlinScriptExternalImportsProvider::class.java, KotlinScriptExternalImportsProviderImpl(projectEnvironment.project, kotlinScriptDefinitionProvider))
526+
registerService(ScriptDependenciesProvider::class.java, CliScriptDependenciesProvider(projectEnvironment.project, kotlinScriptDefinitionProvider))
527527
registerService(KotlinJavaPsiFacade::class.java, KotlinJavaPsiFacade(this))
528528
registerService(KtLightClassForFacade.FacadeStubCache::class.java, KtLightClassForFacade.FacadeStubCache(this))
529529
if (messageCollector != null) {

‎compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/GenericReplCompiler.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import org.jetbrains.kotlin.psi.KtScriptInitializer
3333
import org.jetbrains.kotlin.psi.psiUtil.getChildOfType
3434
import org.jetbrains.kotlin.renderer.DescriptorRenderer
3535
import org.jetbrains.kotlin.script.KotlinScriptDefinition
36-
import org.jetbrains.kotlin.script.KotlinScriptExternalImportsProvider
36+
import org.jetbrains.kotlin.script.ScriptDependenciesProvider
3737
import java.io.File
3838
import java.util.concurrent.locks.ReentrantReadWriteLock
3939
import kotlin.concurrent.write
@@ -68,7 +68,7 @@ open class GenericReplCompiler(disposable: Disposable,
6868
Pair(compilerState.lastLineState!!.psiFile, compilerState.lastLineState!!.errorHolder)
6969
}
7070

71-
val newDependencies = KotlinScriptExternalImportsProvider.getInstance(checker.environment.project).getScriptDependencies(psiFile)
71+
val newDependencies = ScriptDependenciesProvider.getInstance(checker.environment.project).getScriptDependencies(psiFile)
7272
var classpathAddendum: List<File>? = null
7373
if (compilerState.lastDependencies != newDependencies) {
7474
compilerState.lastDependencies = newDependencies

‎compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptExternalImportsProvider.kt‎ renamed to ‎compiler/frontend/src/org/jetbrains/kotlin/script/ScriptDependenciesProvider.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ import com.intellij.openapi.vfs.VirtualFile
2222
import com.intellij.psi.PsiFile
2323
import kotlin.script.dependencies.ScriptDependencies
2424

25-
interface KotlinScriptExternalImportsProvider {
25+
interface ScriptDependenciesProvider {
2626
fun getScriptDependencies(file: VirtualFile): ScriptDependencies?
2727
fun getScriptDependencies(file: PsiFile) = getScriptDependencies(file.virtualFile)
2828

2929
companion object {
30-
fun getInstance(project: Project): KotlinScriptExternalImportsProvider =
31-
ServiceManager.getService(project, KotlinScriptExternalImportsProvider::class.java)
30+
fun getInstance(project: Project): ScriptDependenciesProvider =
31+
ServiceManager.getService(project, ScriptDependenciesProvider::class.java)
3232
}
3333
}
3434

3535
fun getScriptExternalDependencies(file: VirtualFile, project: Project): ScriptDependencies? =
36-
KotlinScriptExternalImportsProvider.getInstance(project).getScriptDependencies(file)
36+
ScriptDependenciesProvider.getInstance(project).getScriptDependencies(file)

‎idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ScriptModuleInfos.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import com.intellij.psi.search.DelegatingGlobalSearchScope
2525
import com.intellij.psi.search.GlobalSearchScope
2626
import com.intellij.psi.search.NonClasspathDirectoriesScope
2727
import com.intellij.util.containers.SLRUCache
28-
import org.jetbrains.kotlin.idea.core.script.KotlinScriptConfigurationManager
28+
import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager
2929
import org.jetbrains.kotlin.idea.stubindex.KotlinSourceFilterScope
3030
import org.jetbrains.kotlin.name.Name
3131
import org.jetbrains.kotlin.script.KotlinScriptDefinition
@@ -43,7 +43,7 @@ data class ScriptModuleInfo(val project: Project, val scriptFile: VirtualFile,
4343
get() = ModuleOrigin.OTHER
4444

4545
val externalDependencies: ScriptDependencies?
46-
get() = KotlinScriptConfigurationManager.getInstance(project).getScriptDependencies(scriptFile)
46+
get() = ScriptDependenciesManager.getInstance(project).getScriptDependencies(scriptFile)
4747

4848
override val name: Name = Name.special("<script ${scriptFile.name} ${scriptDefinition.name}>")
4949

@@ -81,7 +81,7 @@ class ScriptDependenciesModuleInfo(
8181
if (scriptModuleInfo == null) {
8282
// we do not know which scripts these dependencies are
8383
return KotlinSourceFilterScope.libraryClassFiles(
84-
KotlinScriptConfigurationManager.getInstance(project).getAllScriptsClasspathScope(), project
84+
ScriptDependenciesManager.getInstance(project).getAllScriptsClasspathScope(), project
8585
)
8686
}
8787
return project.service<ScriptBinariesScopeCache>().get(scriptModuleInfo.externalDependencies)
@@ -108,15 +108,15 @@ data class ScriptDependenciesSourceModuleInfo(
108108
get() = ScriptDependenciesModuleInfo(project, null)
109109

110110
override fun sourceScope(): GlobalSearchScope = KotlinSourceFilterScope.librarySources(
111-
KotlinScriptConfigurationManager.getInstance(project).getAllLibrarySourcesScope(), project
111+
ScriptDependenciesManager.getInstance(project).getAllLibrarySourcesScope(), project
112112
)
113113

114114
}
115115

116116
private class ScriptBinariesScopeCache(private val project: Project) : SLRUCache<ScriptDependencies, GlobalSearchScope>(6, 6) {
117117
override fun createValue(key: ScriptDependencies?): GlobalSearchScope {
118118
val roots = key?.classpath ?: emptyList()
119-
val classpath = KotlinScriptConfigurationManager.toVfsRoots(roots)
119+
val classpath = ScriptDependenciesManager.toVfsRoots(roots)
120120
// TODO: this is not very efficient because KotlinSourceFilterScope already checks if the files are in scripts classpath
121121
return KotlinSourceFilterScope.libraryClassFiles(NonClasspathDirectoriesScope(classpath), project)
122122
}

‎idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/getModuleInfo.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.asJava.classes.FakeLightClassForFileOfPackage
2424
import org.jetbrains.kotlin.asJava.classes.KtLightClassForFacade
2525
import org.jetbrains.kotlin.asJava.elements.KtLightElement
2626
import org.jetbrains.kotlin.idea.caches.resolve.lightClasses.KtLightClassForDecompiledDeclaration
27-
import org.jetbrains.kotlin.idea.core.script.KotlinScriptConfigurationManager
27+
import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager
2828
import org.jetbrains.kotlin.idea.util.ProjectRootsUtil
2929
import org.jetbrains.kotlin.idea.util.isKotlinBinary
3030
import org.jetbrains.kotlin.idea.util.isInSourceContentWithoutInjected
@@ -116,7 +116,7 @@ private fun getModuleInfoByVirtualFile(project: Project, virtualFile: VirtualFil
116116
}
117117

118118
val isBinary = virtualFile.isKotlinBinary()
119-
val scriptConfigurationManager = KotlinScriptConfigurationManager.getInstance(project)
119+
val scriptConfigurationManager = ScriptDependenciesManager.getInstance(project)
120120
if (isBinary && virtualFile in scriptConfigurationManager.getAllScriptsClasspathScope()) {
121121
return if (treatAsLibrarySource) {
122122
ScriptDependenciesSourceModuleInfo(project)

‎idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ProjectRootsUtil.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import com.intellij.psi.PsiElement
3030
import com.intellij.psi.PsiFileSystemItem
3131
import org.jetbrains.kotlin.idea.KotlinModuleFileType
3232
import org.jetbrains.kotlin.idea.caches.resolve.JsProjectDetector
33-
import org.jetbrains.kotlin.idea.core.script.KotlinScriptConfigurationManager
33+
import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager
3434
import org.jetbrains.kotlin.idea.decompiler.builtIns.KotlinBuiltInFileType
3535
import org.jetbrains.kotlin.idea.util.application.runReadAction
3636

@@ -62,7 +62,7 @@ object ProjectRootsUtil {
6262
val canContainClassFiles = file.fileType == ArchiveFileType.INSTANCE || file.isDirectory
6363
val isBinary = file.isKotlinBinary()
6464

65-
val scriptConfigurationManager = if (includeScriptDependencies) KotlinScriptConfigurationManager.getInstance(project) else null
65+
val scriptConfigurationManager = if (includeScriptDependencies) ScriptDependenciesManager.getInstance(project) else null
6666

6767
if (includeLibraryClasses && (isBinary || canContainClassFiles)) {
6868
if (fileIndex.isInLibraryClasses(file)) return true

‎idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/DependenciesCache.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ internal class DependenciesCache(private val project: Project) {
3535

3636
val allScriptsClasspathCache = ClearableLazyValue(cacheLock) {
3737
val files = cache.values.flatMap { it.classpath }.distinct()
38-
KotlinScriptConfigurationManager.toVfsRoots(files)
38+
ScriptDependenciesManager.toVfsRoots(files)
3939
}
4040

4141
val allScriptsClasspathScope = ClearableLazyValue(cacheLock) {
4242
NonClasspathDirectoriesScope(allScriptsClasspathCache.get())
4343
}
4444

4545
val allLibrarySourcesCache = ClearableLazyValue(cacheLock) {
46-
KotlinScriptConfigurationManager.toVfsRoots(cache.values.flatMap { it.sources }.distinct())
46+
ScriptDependenciesManager.toVfsRoots(cache.values.flatMap { it.sources }.distinct())
4747
}
4848

4949
val allLibrarySourcesScope = ClearableLazyValue(cacheLock) {

‎idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/KotlinScriptDependenciesClassFinder.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,20 @@ import org.jetbrains.kotlin.load.java.AbstractJavaClassFinder
3030
import org.jetbrains.kotlin.resolve.jvm.KotlinSafeClassFinder
3131

3232
class KotlinScriptDependenciesClassFinder(project: Project,
33-
private val kotlinScriptConfigurationManager: KotlinScriptConfigurationManager
33+
private val scriptDependenciesManager: ScriptDependenciesManager
3434
) : NonClasspathClassFinder(project), KotlinSafeClassFinder {
3535

3636
private val myCaches by lazy {
3737
object : ConcurrentFactoryMap<VirtualFile, PackageDirectoryCache>() {
3838
override fun create(file: VirtualFile): PackageDirectoryCache? {
39-
val scriptClasspath = kotlinScriptConfigurationManager.getScriptClasspath(file)
39+
val scriptClasspath = scriptDependenciesManager.getScriptClasspath(file)
4040
val v = createCache(scriptClasspath)
4141
return v
4242
}
4343
}
4444
}
4545

46-
override fun calcClassRoots(): List<VirtualFile> = kotlinScriptConfigurationManager.getAllScriptsClasspath().toList()
46+
override fun calcClassRoots(): List<VirtualFile> = scriptDependenciesManager.getAllScriptsClasspath().toList()
4747

4848
override fun getCache(scope: GlobalSearchScope?): PackageDirectoryCache =
4949
(scope as? ScriptModuleSearchScope ?:

‎idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/KotlinScriptConfigurationManager.kt‎ renamed to ‎idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesManager.kt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,23 @@ import com.intellij.openapi.vfs.VirtualFile
2424
import com.intellij.util.io.URLUtil
2525
import org.jetbrains.annotations.TestOnly
2626
import org.jetbrains.kotlin.script.KotlinScriptDefinitionProvider
27-
import org.jetbrains.kotlin.script.KotlinScriptExternalImportsProvider
27+
import org.jetbrains.kotlin.script.ScriptDependenciesProvider
2828
import org.jetbrains.kotlin.script.makeScriptDefsFromTemplatesProviderExtensions
2929
import java.io.File
3030
import kotlin.script.dependencies.ScriptDependencies
3131

3232

33-
// NOTE: this service exists exclusively because KotlinScriptConfigurationManager
33+
// NOTE: this service exists exclusively because ScriptDependencyManager
3434
// cannot be registered as implementing two services (state would be duplicated)
35-
class IdeScriptExternalImportsProvider(
36-
private val scriptConfigurationManager: KotlinScriptConfigurationManager
37-
) : KotlinScriptExternalImportsProvider {
35+
class IdeScriptDependenciesProvider(
36+
private val scriptDependenciesManager: ScriptDependenciesManager
37+
) : ScriptDependenciesProvider {
3838
override fun getScriptDependencies(file: VirtualFile): ScriptDependencies? {
39-
return scriptConfigurationManager.getScriptDependencies(file)
39+
return scriptDependenciesManager.getScriptDependencies(file)
4040
}
4141
}
4242

43-
class KotlinScriptConfigurationManager(
43+
class ScriptDependenciesManager(
4444
private val project: Project,
4545
private val scriptDefinitionProvider: KotlinScriptDefinitionProvider
4646
) {
@@ -66,8 +66,8 @@ class KotlinScriptConfigurationManager(
6666

6767
companion object {
6868
@JvmStatic
69-
fun getInstance(project: Project): KotlinScriptConfigurationManager =
70-
ServiceManager.getService(project, KotlinScriptConfigurationManager::class.java)
69+
fun getInstance(project: Project): ScriptDependenciesManager =
70+
ServiceManager.getService(project, ScriptDependenciesManager::class.java)
7171

7272
fun toVfsRoots(roots: Iterable<File>): List<VirtualFile> {
7373
return roots.mapNotNull { it.classpathEntryToVfs() }
@@ -84,7 +84,7 @@ class KotlinScriptConfigurationManager(
8484
return res
8585
}
8686

87-
internal val log = Logger.getInstance(KotlinScriptConfigurationManager::class.java)
87+
internal val log = Logger.getInstance(ScriptDependenciesManager::class.java)
8888

8989
@TestOnly
9090
fun updateScriptDependenciesSynchronously(virtualFile: VirtualFile, project: Project) {

0 commit comments

Comments
 (0)