From eb5be038fad75c4a5a2214e0a2fe30861706fa7d Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 18 Jul 2017 16:04:01 +0300 Subject: [PATCH] ScriptDependenciesUpdater: compute script contents synchronously --- .../core/script/ScriptDependenciesUpdater.kt | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesUpdater.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesUpdater.kt index cb174da5975..448eb6e1397 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesUpdater.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesUpdater.kt @@ -153,25 +153,17 @@ internal class ScriptDependenciesUpdater( } val dependenciesResolver = scriptDef.dependencyResolver + val scriptContents = contentLoader.getScriptContents(scriptDef, file) + val environment = contentLoader.getEnvironment(scriptDef) val newJob = if (dependenciesResolver is AsyncDependenciesResolver) { launch(asyncUpdatesDispatcher) { - process( - dependenciesResolver.resolveAsync( - contentLoader.getScriptContents(scriptDef, file), - contentLoader.getEnvironment(scriptDef) - ) - ) + process(dependenciesResolver.resolveAsync(scriptContents, environment)) } } else { assert(dependenciesResolver is LegacyResolverWrapper) launch(legacyUpdatesDispatcher) { - process( - dependenciesResolver.resolve( - contentLoader.getScriptContents(scriptDef, file), - contentLoader.getEnvironment(scriptDef) - ) - ) + process(dependenciesResolver.resolve(scriptContents, environment)) } } return TimeStampedJob(newJob, currentTimeStamp)