From a55a0d94dee482e856633eca71a64dac8de34d43 Mon Sep 17 00:00:00 2001
From: Natalia Selezneva <natalia.selezneva@jetbrains.com>
Date: Thu, 16 Jan 2020 09:33:30 +0300
Subject: [PATCH] Scripts: clear manual configuration loading state after
 project import

^KT-35268
---
 .../kotlin/idea/core/script/ScriptConfigurationManager.kt   | 6 ++++++
 .../scripting/gradle/GradleScriptConfigurationLoader.kt     | 2 ++
 2 files changed, 8 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 544a8cec4fd..7227862ebbe 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
@@ -175,6 +175,12 @@ interface ScriptConfigurationManager {
             (getInstance(project) as AbstractScriptConfigurationManager).clearCaches()
         }
 
+        fun clearManualConfigurationLoadingIfNeeded(file: VirtualFile) {
+            if (file.LOAD_CONFIGURATION_MANUALLY == true) {
+                file.LOAD_CONFIGURATION_MANUALLY = null
+            }
+        }
+
         fun markFileWithManualConfigurationLoading(file: VirtualFile) {
             file.LOAD_CONFIGURATION_MANUALLY = true
         }
diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptConfigurationLoader.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptConfigurationLoader.kt
index 4f4f0810268..7dad45a8f01 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptConfigurationLoader.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptConfigurationLoader.kt
@@ -69,6 +69,8 @@ class GradleScriptConfigurationLoader(project: Project) : DefaultScriptConfigura
             return true
         }
 
+        ScriptConfigurationManager.clearManualConfigurationLoadingIfNeeded(vFile)
+
         // Gradle read files from FS
         GlobalScope.launch(EDT(project)) {
             runWriteAction {