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

KSCM: persist script dependencies between idea launches

Browse Source
This commit is contained in:
Pavel V. Talanov
2017-06-14 18:50:54 +03:00
parent 930d502b12
commit 1834721880
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/KotlinScriptConfigurationManager.kt
+14 -1
View File
@@ -155,13 +155,26 @@ class KotlinScriptConfigurationManager(
fun <TF : Any> getExternalImports(file: TF): KotlinScriptExternalDependencies = cacheLock.read { fun <TF : Any> getExternalImports(file: TF): KotlinScriptExternalDependencies = cacheLock.read {
val path = getFilePath(file) val path = getFilePath(file)
cache[path]?.dependencies?.let { return it } val cached = cache[path]
cached?.dependencies?.let { return it }
tryLoadingFromDisk(cached, file, path)
updateExternalImportsCache(listOf(file)) updateExternalImportsCache(listOf(file))
return cache[path]?.dependencies ?: NoDependencies return cache[path]?.dependencies ?: NoDependencies
} }
private fun <TF : Any> tryLoadingFromDisk(cached: DataAndRequest?, file: TF, path: String) {
if (cached != null || file !is VirtualFile) return
ScriptDependenciesFileAttribute.read(file)?.let { deserialized ->
save(path, deserialized, file, persist = false)
invalidateLocalCaches()
notifyRootsChanged()
}
}
private fun <TF: Any> updateExternalImportsCache(files: Iterable<TF>) = cacheLock.write { private fun <TF: Any> updateExternalImportsCache(files: Iterable<TF>) = cacheLock.write {
files.mapNotNull { file -> files.mapNotNull { file ->
scriptDefinitionProvider.findScriptDefinition(file)?.let { scriptDefinitionProvider.findScriptDefinition(file)?.let {