Skip to content

Commit d5ca461

Browse files
committed
Refactor: Make DependenciesCache and ScriptDependenciesUpdater services
Rename: DependenciesCache -> ScriptDependenciesCache (makes sense to make name more specific since it is a service now)
1 parent f1811e7 commit d5ca461

File tree

4 files changed

+12
-7
lines changed

4 files changed

+12
-7
lines changed

idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/DependenciesCache.kt renamed to idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesCache.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import kotlin.concurrent.read
2626
import kotlin.concurrent.write
2727
import kotlin.script.dependencies.ScriptDependencies
2828

29-
internal class DependenciesCache(private val project: Project) {
29+
internal class ScriptDependenciesCache(private val project: Project) {
3030
private val cacheLock = ReentrantReadWriteLock()
3131
private val cache = hashMapOf<String, ScriptDependencies>()
3232

idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesManager.kt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,12 @@ class IdeScriptDependenciesProvider(
4040
}
4141
}
4242

43-
class ScriptDependenciesManager(
43+
class ScriptDependenciesManager internal constructor(
4444
private val project: Project,
45-
private val scriptDefinitionProvider: KotlinScriptDefinitionProvider
45+
private val scriptDefinitionProvider: KotlinScriptDefinitionProvider,
46+
private val cacheUpdater: ScriptDependenciesUpdater,
47+
private val cache: ScriptDependenciesCache
4648
) {
47-
private val cache = DependenciesCache(project)
48-
private val cacheUpdater = ScriptDependenciesUpdater(project, cache, scriptDefinitionProvider)
49-
5049
init {
5150
reloadScriptDefinitions()
5251
}

idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesUpdater.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import kotlin.script.dependencies.experimental.AsyncDependenciesResolver
4242

4343
internal class ScriptDependenciesUpdater(
4444
private val project: Project,
45-
private val cache: DependenciesCache,
45+
private val cache: ScriptDependenciesCache,
4646
private val scriptDefinitionProvider: KotlinScriptDefinitionProvider
4747
) {
4848
private val requests = ConcurrentHashMap<String, ModStampedRequest>()

idea/src/META-INF/plugin.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,12 @@
284284
<projectService serviceInterface="org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager"
285285
serviceImplementation="org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager"/>
286286

287+
<projectService serviceInterface="org.jetbrains.kotlin.idea.core.script.ScriptDependenciesCache"
288+
serviceImplementation="org.jetbrains.kotlin.idea.core.script.ScriptDependenciesCache"/>
289+
290+
<projectService serviceInterface="org.jetbrains.kotlin.idea.core.script.ScriptDependenciesUpdater"
291+
serviceImplementation="org.jetbrains.kotlin.idea.core.script.ScriptDependenciesUpdater"/>
292+
287293
<projectService serviceInterface="org.jetbrains.kotlin.script.ScriptReportSink"
288294
serviceImplementation="org.jetbrains.kotlin.idea.core.script.IdeScriptReportSink"/>
289295

0 commit comments

Comments
 (0)