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

scripting: skip loading when reverting to applied configuration

Browse Source
This commit is contained in:
Sergey Rostov
2019-11-06 13:14:34 +03:00
committed by Natalia Selezneva
parent 2499c42ac4
commit 96b4ceb067
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/DefaultScriptConfigurationManager.kt
+8 -3
View File
@@ -175,10 +175,15 @@ internal class DefaultScriptConfigurationManager(project: Project) :
async.first { it.loadDependencies(isFirstLoad, virtualFile, scriptDefinition, loadingContext) }
} else {
backgroundExecutor.ensureScheduled(virtualFile) {
// don't start loading if nothing was changed
// (in case we checking for up-to-date and loading concurrently)
val cached = getCachedConfigurationState(virtualFile)
if (cached == null || !cached.isUpToDate(project, virtualFile)) {
val applied = cached?.applied
if (applied != null && applied.inputs.isUpToDate(project, virtualFile)) {
// in case user reverted to applied configuration
suggestOrSaveConfiguration(virtualFile, applied, false)
} else if (cached == null || !cached.isUpToDate(project, virtualFile)) {
// don't start loading if nothing was changed
// (in case we checking for up-to-date and loading concurrently)
val actualIsFirstLoad = cached == null
async.first { it.loadDependencies(actualIsFirstLoad, virtualFile, scriptDefinition, loadingContext) }
}