azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix indexing for force load configuration action

Browse Source
This commit is contained in:
Natalia Selezneva
2020-04-20 16:39:10 +03:00
parent c52e5d180a
commit 3904e0f97c
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/DefaultScriptingSupport.kt
+2
View File
@@ -167,6 +167,7 @@ class DefaultScriptingSupport(project: Project) : DefaultScriptingSupportBase(pr
if (!ScriptDefinitionsManager.getInstance(project).isReady()) return null if (!ScriptDefinitionsManager.getInstance(project).isReady()) return null
val scriptDefinition = file.findScriptDefinition() ?: return null val scriptDefinition = file.findScriptDefinition() ?: return null
rootsIndexer.transaction {
if (!loader.shouldRunInBackground(scriptDefinition)) { if (!loader.shouldRunInBackground(scriptDefinition)) {
loader.loadDependencies(false, file, scriptDefinition, loadingContext) loader.loadDependencies(false, file, scriptDefinition, loadingContext)
} else { } else {
@@ -174,6 +175,7 @@ class DefaultScriptingSupport(project: Project) : DefaultScriptingSupportBase(pr
loader.loadDependencies(false, file, scriptDefinition, loadingContext) loader.loadDependencies(false, file, scriptDefinition, loadingContext)
} }
} }
}
return getAppliedConfiguration(virtualFile)?.configuration return getAppliedConfiguration(virtualFile)?.configuration
} }