From ca331d2f554bd59940750b489955f10ad60fa9a7 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Sun, 7 May 2017 17:21:29 +0200
Subject: [PATCH] Optimize scripting-related cache creation and update

reduce number of cases when changes are reported from script dependencies
  provider, that causing rootsChanged event, in particular empty dependencies
  are filtered out now

Should reduce IDEA startup delays.
---
 ...KotlinScriptExternalImportsProviderImpl.kt | 61 +++++++++----------
 1 file changed, 29 insertions(+), 32 deletions(-)

diff --git a/compiler/frontend.script/src/org/jetbrains/kotlin/script/KotlinScriptExternalImportsProviderImpl.kt b/compiler/frontend.script/src/org/jetbrains/kotlin/script/KotlinScriptExternalImportsProviderImpl.kt
index 96a331731c3..39b8c83da6a 100644
--- a/compiler/frontend.script/src/org/jetbrains/kotlin/script/KotlinScriptExternalImportsProviderImpl.kt
+++ b/compiler/frontend.script/src/org/jetbrains/kotlin/script/KotlinScriptExternalImportsProviderImpl.kt
@@ -68,25 +68,22 @@ class KotlinScriptExternalImportsProviderImpl(
         var filesCount = 0
         var additionsCount = 0
         val (res, time) = measureThreadTimeMillis {
-            val uncached = hashSetOf<String>()
             files.mapNotNull { file ->
                 filesCount += 1
-                val path = getFilePath(file)
-                if (isValidFile(file) && !cache.containsKey(path) && !uncached.contains(path)) {
-                    val scriptDef = scriptDefinitionProvider.findScriptDefinition(file)
-                    if (scriptDef != null) {
+                val scriptDef = scriptDefinitionProvider.findScriptDefinition(file)
+                if (scriptDef != null) {
+                    val path = getFilePath(file)
+                    if (isValidFile(file) && !cache.containsKey(path)) {
                         val deps = scriptDef.getDependenciesFor(file, project, null)
+                        cache.put(path, deps)
                         if (deps != null) {
                             log.info("[kts] cached deps for $path: ${deps.classpath.joinToString(File.pathSeparator)}")
+                            additionsCount += 1
+                            file
                         }
-                        cache.put(path, deps)
-                        additionsCount += 1
-                        file
-                    }
-                    else {
-                        uncached.add(path)
-                        null
+                        else null
                     }
+                    else null
                 }
                 else null
             }
@@ -104,20 +101,18 @@ class KotlinScriptExternalImportsProviderImpl(
         val (res, time) = measureThreadTimeMillis {
             files.mapNotNull { file ->
                 filesCount += 1
-                val path = getFilePath(file)
-                if (!isValidFile(file)) {
-                    if (cache.remove(path) != null) {
-                        log.debug("[kts] removed deps for file $path")
-                        updatesCount += 1
-                        file
-                    } // cleared
-                    else {
-                        null // unknown
+                val scriptDef = scriptDefinitionProvider.findScriptDefinition(file)
+                if (scriptDef != null) {
+                    val path = getFilePath(file)
+                    if (!isValidFile(file)) {
+                        if (cache.remove(path) != null) {
+                            log.debug("[kts] removed deps for file $path")
+                            updatesCount += 1
+                            file
+                        } // cleared
+                        else null // unknown
                     }
-                }
-                else {
-                    val scriptDef = scriptDefinitionProvider.findScriptDefinition(file)
-                    if (scriptDef != null) {
+                    else {
                         val oldDeps = cache[path]
                         val deps = scriptDef.getDependenciesFor(file, project, oldDeps)
                         when {
@@ -126,21 +121,23 @@ class KotlinScriptExternalImportsProviderImpl(
                                 // changed or new
                                 log.info("[kts] updated/new cached deps for $path: ${deps.classpath.joinToString(File.pathSeparator)}")
                                 cache.put(path, deps)
+                                updatesCount += 1
+                                file
                             }
                             deps != null -> {
                                 // same as before
+                                null
                             }
-                            else -> {
-                                if (cache.remove(path) != null) {
-                                    log.debug("[kts] removed deps for $path")
-                                } // cleared
+                            cache.remove(path) != null -> {
+                                log.debug("[kts] removed deps for $path")
+                                updatesCount += 1
+                                file
                             }
+                            else -> null // unknown
                         }
-                        updatesCount += 1
-                        file
                     }
-                    else null // not a script
                 }
+                else null // not a script
             }
         }
         if (updatesCount > 0) {