From 5474d55795691fda55a1efaa5208467bb91fb4a6 Mon Sep 17 00:00:00 2001
From: Sergey Rostov <sergey.rostov@jetbrains.com>
Date: Thu, 7 May 2020 16:38:44 +0300
Subject: [PATCH] Scripting, minor: updateScriptDefinitions ->
 updateScriptDefinitionReferences

---
 .../kotlin/idea/core/script/ScriptConfigurationManager.kt   | 4 ++--
 .../kotlin/idea/core/script/ScriptDefinitionsManager.kt     | 2 +-
 .../configuration/CompositeScriptConfigurationManager.kt    | 6 +-----
 .../idea/core/script/configuration/ScriptingSupport.kt      | 1 -
 .../idea/scripting/gradle/roots/GradleBuildRootsManager.kt  | 4 ----
 5 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationManager.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationManager.kt
index 41228fd2687..038ea740c6f 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationManager.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationManager.kt
@@ -90,9 +90,9 @@ interface ScriptConfigurationManager {
     fun isConfigurationLoadingInProgress(file: KtFile): Boolean
 
     /**
-     * Clear all caches and re-highlighting opened scripts
+     * Update caches that depends on script definitions and do update if necessary
      */
-    fun updateScriptDefinitions()
+    fun updateScriptDefinitionReferences()
 
     ///////////////
     // classpath roots info:
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt
index f12b257692b..d72331903db 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt
@@ -197,7 +197,7 @@ class ScriptDefinitionsManager(private val project: Project) : LazyScriptDefinit
         scriptDefinitionsCacheLock.withLock { scriptDefinitionsCache.clear() }
 
         // TODO: clear by script type/definition
-        ScriptConfigurationManager.getInstance(project).updateScriptDefinitions()
+        ScriptConfigurationManager.getInstance(project).updateScriptDefinitionReferences()
     }
 
     private fun ScriptDefinitionsSource.safeGetDefinitions(): List<ScriptDefinition> {
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/CompositeScriptConfigurationManager.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/CompositeScriptConfigurationManager.kt
index a1c79a2b160..0088703d7b9 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/CompositeScriptConfigurationManager.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/CompositeScriptConfigurationManager.kt
@@ -100,16 +100,12 @@ class CompositeScriptConfigurationManager(val project: Project) : ScriptConfigur
         return new.diff(old)
     }
 
-    override fun updateScriptDefinitions() {
+    override fun updateScriptDefinitionReferences() {
         ScriptDependenciesModificationTracker.getInstance(project).incModificationCount()
 
         default.updateScriptDefinitions()
 
         if (classpathRoots.customDefinitionsUsed) {
-            plugins.forEach {
-                it.updateScriptDefinitions()
-            }
-
             updater.ensureUpdateScheduled()
         }
     }
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/ScriptingSupport.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/ScriptingSupport.kt
index 3b2b55b4b30..e83cf0d7ec3 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/ScriptingSupport.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/ScriptingSupport.kt
@@ -12,7 +12,6 @@ import org.jetbrains.kotlin.psi.KtFile
 
 abstract class ScriptingSupport {
     abstract class Provider {
-        abstract fun updateScriptDefinitions()
         abstract fun isApplicable(file: VirtualFile): Boolean
         abstract fun isConfigurationLoadingInProgress(file: KtFile): Boolean
         abstract fun collectConfigurations(builder: ScriptClassRootsCache.Builder)
diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRootsManager.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRootsManager.kt
index 69a24868027..b5c660e359e 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRootsManager.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRootsManager.kt
@@ -68,10 +68,6 @@ class GradleBuildRootsManager(val project: Project) : ScriptingSupport.Provider(
     ////////////
     /// ScriptingSupport.Provider implementation:
 
-    override fun updateScriptDefinitions() {
-        // nothing related to script definition and project roots are cached
-    }
-
     override fun isApplicable(file: VirtualFile): Boolean {
         val scriptUnderRoot = findScriptBuildRoot(file) ?: return false
         if (scriptUnderRoot.root is GradleBuildRoot.Legacy) return false