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

KSCM: fix wrong update on null return from Template.getDependenciesFor

Browse Source
This commit is contained in:
Pavel V. Talanov
2017-06-16 19:36:51 +03:00
parent 1834721880
commit ff391628de
1 changed files with 8 additions and 10 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
+8 -10
View File
@@ -224,7 +224,7 @@ class KotlinScriptConfigurationManager(
val currentTimeStamp = TimeStamps.next() val currentTimeStamp = TimeStamps.next()
val scriptContents = scriptDefinition.makeScriptContents(file, project) val scriptContents = scriptDefinition.makeScriptContents(file, project)
val newFuture = supplyAsync(Supplier { val newFuture = supplyAsync(Supplier {
val newDependencies = scriptDefinition.getDependenciesFor(oldDataAndRequest?.dependencies, scriptContents) val newDependencies = scriptDefinition.getDependenciesFor(oldDataAndRequest?.dependencies, scriptContents) ?: EmptyDependencies
cacheLock.read { cacheLock.read {
val lastTimeStamp = cache[path]?.requestInProgress?.timeStamp val lastTimeStamp = cache[path]?.requestInProgress?.timeStamp
if (lastTimeStamp == currentTimeStamp) { if (lastTimeStamp == currentTimeStamp) {
@@ -254,31 +254,27 @@ class KotlinScriptConfigurationManager(
private fun <TF : Any> updateSync(file: TF, scriptDef: KotlinScriptDefinition): Boolean { private fun <TF : Any> updateSync(file: TF, scriptDef: KotlinScriptDefinition): Boolean {
val path = getFilePath(file) val path = getFilePath(file)
val oldDeps = cache[path]?.dependencies val oldDeps = cache[path]?.dependencies
val deps = scriptDef.getDependenciesFor(file, project, oldDeps) val deps = scriptDef.getDependenciesFor(file, project, oldDeps) ?: EmptyDependencies
return cacheSync(deps, oldDeps, path, file as? VirtualFile) return cacheSync(deps, oldDeps, path, file as? VirtualFile)
} }
private fun cacheSync( private fun cacheSync(
new: KotlinScriptExternalDependencies?, new: KotlinScriptExternalDependencies,
old: KotlinScriptExternalDependencies?, old: KotlinScriptExternalDependencies?,
path: String, path: String,
file: VirtualFile? file: VirtualFile?
): Boolean { ): Boolean {
return when { return when {
new != null && (old == null || !(new.match(old))) -> { old == null || !(new.match(old)) -> {
// changed or new // changed or new
save(path, new, file, persist = true) save(path, new, file, persist = true)
true true
} }
new != null -> { else -> {
save(path, new, file, persist = false) save(path, new, file, persist = false)
// same
false false
} // same
cache.remove(path) != null -> {
save(path, null, file, persist = true)
true
} }
else -> false // unknown
} }
} }
@@ -384,3 +380,5 @@ object TimeStamps {
fun next() = TimeStamp(current++) fun next() = TimeStamp(current++)
} }
private object EmptyDependencies: KotlinScriptExternalDependencies