From a2d284c7690c88d9e1038f502c3868aa1a1e4396 Mon Sep 17 00:00:00 2001 From: Natalia Selezneva Date: Thu, 11 Jul 2019 15:51:05 +0300 Subject: [PATCH] ScriptDefinitionsManager shouldn't be ready if definitions aren't initialized yet (KT-32554) Otherwise this can lead to wrong script definition detection on project opening ^KT-32554 Fixed --- .../kotlin/idea/core/script/ScriptDefinitionsManager.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 7a47fca9ece..493adefedb6 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 @@ -147,7 +147,10 @@ class ScriptDefinitionsManager(private val project: Project) : LazyScriptDefinit } fun isReady(): Boolean { - return definitionsBySource.keys.all { source -> + if (definitions == null) { + reloadScriptDefinitions() + } + return definitions != null && definitionsBySource.keys.all { source -> // TODO: implement another API for readiness checking (source as? ScriptDefinitionContributor)?.isReady() != false }