From 45f0328f21f7572a901d3490182c8ff713d870e0 Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Fri, 17 Jul 2020 14:52:29 +0300 Subject: [PATCH] scripting: preload scripting support plugins --- .../kotlin/idea/core/script/ScriptConfigurationManager.kt | 2 ++ .../kotlin/idea/core/script/ScriptDefinitionsManager.kt | 1 + .../configuration/CompositeScriptConfigurationManager.kt | 4 ++++ 3 files changed, 7 insertions(+) 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 367b1a374bc..5dbb8f9408c 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 @@ -62,6 +62,8 @@ class IdeScriptDependenciesProvider(project: Project) : ScriptDependenciesProvid * of opened files when configuration will be loaded or updated. */ interface ScriptConfigurationManager { + fun loadPlugins() + /** * Get cached configuration for [file] or load it. * May return null even configuration was loaded but was not yet applied. 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 8585504eabb..088569cd657 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 @@ -68,6 +68,7 @@ class LoadScriptDefinitionsStartupActivity : StartupActivity { } else { executeOnPooledThread { ScriptDefinitionsManager.getInstance(project).reloadScriptDefinitionsIfNeeded() + ScriptConfigurationManager.getInstance(project).loadPlugins() } } } 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 ed2fef5d2da..1378bb9b315 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 @@ -65,6 +65,10 @@ class CompositeScriptConfigurationManager(val project: Project) : ScriptConfigur } } + override fun loadPlugins() { + plugins + } + fun tryGetScriptDefinitionFast(locationId: String): ScriptDefinition? { return classpathRoots.getLightScriptInfo(locationId)?.definition }