azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor: Make DependenciesCache and ScriptDependenciesUpdater services

Browse Source 
Rename: DependenciesCache -> ScriptDependenciesCache
    (makes sense to make name more specific since it is a service now)
This commit is contained in:
Pavel V. Talanov
2017-07-20 14:56:10 +03:00
parent f1811e7f0e
commit d5ca46157a
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/DependenciesCache.kt → idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesCache.kt
+1 -1
View File
@@ -26,7 +26,7 @@ import kotlin.concurrent.read
import kotlin.concurrent.write import kotlin.concurrent.write
import kotlin.script.dependencies.ScriptDependencies 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 cacheLock = ReentrantReadWriteLock()
private val cache = hashMapOf<String, ScriptDependencies>() private val cache = hashMapOf<String, ScriptDependencies>()
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesManager.kt
+4 -5
View File
@@ -40,13 +40,12 @@ class IdeScriptDependenciesProvider(
} }
} }
class ScriptDependenciesManager( class ScriptDependenciesManager internal constructor(
private val project: Project, 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 { init {
reloadScriptDefinitions() reloadScriptDefinitions()
} }
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesUpdater.kt
+1 -1
View File
@@ -42,7 +42,7 @@ import kotlin.script.dependencies.experimental.AsyncDependenciesResolver
internal class ScriptDependenciesUpdater( internal class ScriptDependenciesUpdater(
private val project: Project, private val project: Project,
private val cache: DependenciesCache, private val cache: ScriptDependenciesCache,
private val scriptDefinitionProvider: KotlinScriptDefinitionProvider private val scriptDefinitionProvider: KotlinScriptDefinitionProvider
) { ) {
private val requests = ConcurrentHashMap<String, ModStampedRequest>() private val requests = ConcurrentHashMap<String, ModStampedRequest>()
idea/src/META-INF/plugin.xml
+6
View File
@@ -284,6 +284,12 @@
<projectService serviceInterface="org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager" <projectService serviceInterface="org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager"
serviceImplementation="org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager"/> serviceImplementation="org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager"/>
<projectService serviceInterface="org.jetbrains.kotlin.idea.core.script.ScriptDependenciesCache"
serviceImplementation="org.jetbrains.kotlin.idea.core.script.ScriptDependenciesCache"/>
<projectService serviceInterface="org.jetbrains.kotlin.idea.core.script.ScriptDependenciesUpdater"
serviceImplementation="org.jetbrains.kotlin.idea.core.script.ScriptDependenciesUpdater"/>
<projectService serviceInterface="org.jetbrains.kotlin.script.ScriptReportSink" <projectService serviceInterface="org.jetbrains.kotlin.script.ScriptReportSink"
serviceImplementation="org.jetbrains.kotlin.idea.core.script.IdeScriptReportSink"/> serviceImplementation="org.jetbrains.kotlin.idea.core.script.IdeScriptReportSink"/>