From 320c5f6f3afdaf346d8f33fe3d614e1cd87851aa Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Thu, 12 Oct 2017 19:06:03 +0300 Subject: [PATCH] Try to approximate "build.gradle.kts" script dependencies on first access This is a hacky solution to prevent whole file being highlighted as unresolved while we wait for gradle response --- .../idea/caches/resolve/ScriptModuleInfos.kt | 2 +- .../core/script/ScriptDependenciesCache.kt | 2 + .../core/script/ScriptDependenciesManager.kt | 2 +- .../core/script/ScriptDependenciesUpdater.kt | 44 ++++++++++++++----- .../script/GradleScriptTemplateProvider.kt | 38 +++++++++++++++- idea/src/META-INF/extensions/common.xml | 3 ++ idea/src/META-INF/gradle.xml | 1 + 7 files changed, 79 insertions(+), 13 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ScriptModuleInfos.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ScriptModuleInfos.kt index 5c2cd6bccaf..08e013c0693 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ScriptModuleInfos.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ScriptModuleInfos.kt @@ -45,7 +45,7 @@ data class ScriptModuleInfo( override val moduleOrigin: ModuleOrigin get() = ModuleOrigin.OTHER - val externalDependencies: ScriptDependencies? + val externalDependencies: ScriptDependencies get() = ScriptDependenciesManager.getInstance(project).getScriptDependencies(scriptFile) override val name: Name = Name.special("