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

Simplify logic in ScriptDependenciesLoader

Browse Source
This commit is contained in:
Natalia Selezneva
2018-11-02 15:02:36 +03:00
parent 18c9d968f9
commit ad43c2dc1c
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/ScriptDependenciesLoader.kt
+8 -2
View File
@@ -70,9 +70,15 @@ abstract class ScriptDependenciesLoader(
protected fun processResult(result: DependenciesResolver.ResolveResult) { protected fun processResult(result: DependenciesResolver.ResolveResult) {
loaders.remove(file) loaders.remove(file)
val newDependencies = result.dependencies?.adjustByDefinition(scriptDef) ?: return if (cache[file] == null) {
saveDependencies(result)
attachReports(result)
return
}
val newDependencies = result.dependencies?.adjustByDefinition(scriptDef)
if (cache[file] != newDependencies) { if (cache[file] != newDependencies) {
if (shouldShowNotification() && cache[file] != null && !ApplicationManager.getApplication().isUnitTestMode) { if (shouldShowNotification() && !ApplicationManager.getApplication().isUnitTestMode) {
file.addScriptDependenciesNotificationPanel(result, project) { file.addScriptDependenciesNotificationPanel(result, project) {
saveDependencies(it) saveDependencies(it)
attachReports(it) attachReports(it)