From 48909794769a55d9fdad9ccf3846ecee190280df Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Thu, 7 Dec 2017 16:39:17 +0300 Subject: [PATCH] ScriptDefinitionsManager: ignore reloadDefinitionsBy calls If definitions are not loaded yet --- .../kotlin/idea/core/script/ScriptDefinitionsManager.kt | 3 ++- 1 file changed, 2 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 5f6e35fcfc7..57531f60b03 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 @@ -47,7 +47,8 @@ class ScriptDefinitionsManager(private val project: Project): ScriptDefinitionPr private var definitions: List = emptyList() fun reloadDefinitionsBy(contributor: ScriptDefinitionContributor) = lock.write { - currentDefinitions() //force definitions to be computed + val notLoadedYet = definitions.isEmpty() + if (notLoadedYet) return if (contributor !in definitionsByContributor) error("Unknown contributor: ${contributor.id}")