diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/DependenciesCache.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesCache.kt similarity index 97% rename from idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/DependenciesCache.kt rename to idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesCache.kt index 0391217721f..a45352117a9 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/DependenciesCache.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesCache.kt @@ -26,7 +26,7 @@ import kotlin.concurrent.read import kotlin.concurrent.write import kotlin.script.dependencies.ScriptDependencies -internal class DependenciesCache(private val project: Project) { +internal class ScriptDependenciesCache(private val project: Project) { private val cacheLock = ReentrantReadWriteLock() private val cache = hashMapOf() 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/ScriptDependenciesManager.kt index 14b830baf98..9118cd34b1e 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/ScriptDependenciesManager.kt @@ -40,13 +40,12 @@ class IdeScriptDependenciesProvider( } } -class ScriptDependenciesManager( +class ScriptDependenciesManager internal constructor( private val project: Project, - private val scriptDefinitionProvider: KotlinScriptDefinitionProvider + private val scriptDefinitionProvider: KotlinScriptDefinitionProvider, + private val cacheUpdater: ScriptDependenciesUpdater, + private val cache: ScriptDependenciesCache ) { - private val cache = DependenciesCache(project) - private val cacheUpdater = ScriptDependenciesUpdater(project, cache, scriptDefinitionProvider) - init { reloadScriptDefinitions() } diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesUpdater.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesUpdater.kt index d2cddecef30..809223083d9 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesUpdater.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesUpdater.kt @@ -42,7 +42,7 @@ import kotlin.script.dependencies.experimental.AsyncDependenciesResolver internal class ScriptDependenciesUpdater( private val project: Project, - private val cache: DependenciesCache, + private val cache: ScriptDependenciesCache, private val scriptDefinitionProvider: KotlinScriptDefinitionProvider ) { private val requests = ConcurrentHashMap() diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index 98d56d7a786..8d63f0bf4ea 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -284,6 +284,12 @@ + + + +