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

Fix restoring script configuration from file attributes

Browse Source 
#KT-41622 fixed
This commit is contained in:
Ilya Chernikov
2020-09-30 21:36:36 +02:00
parent d88e87aaac
commit 2828f0a814
1 changed files with 9 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/cache/ScriptConfigurationFileAttributeCache.kt
Vendored
+9 -4
View File
@@ -18,9 +18,8 @@ import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition
import org.jetbrains.kotlin.scripting.resolve.KtFileScriptSource import org.jetbrains.kotlin.scripting.resolve.KtFileScriptSource
import org.jetbrains.kotlin.scripting.resolve.ScriptCompilationConfigurationWrapper.FromCompilationConfiguration import org.jetbrains.kotlin.scripting.resolve.ScriptCompilationConfigurationWrapper.FromCompilationConfiguration
import java.io.Serializable import java.io.Serializable
import kotlin.script.experimental.api.ScriptCompilationConfiguration import kotlin.script.experimental.api.*
import kotlin.script.experimental.api.ScriptDiagnostic import kotlin.script.experimental.host.withDefaultsFrom
import kotlin.script.experimental.api.dependencies
import kotlin.script.experimental.jvm.impl.toClassPathOrEmpty import kotlin.script.experimental.jvm.impl.toClassPathOrEmpty
internal class ScriptConfigurationFileAttributeCache( internal class ScriptConfigurationFileAttributeCache(
@@ -45,7 +44,13 @@ internal class ScriptConfigurationFileAttributeCache(
ScriptConfigurationSnapshot( ScriptConfigurationSnapshot(
fromFs.inputs, fromFs.inputs,
fromFs.reports, fromFs.reports,
FromCompilationConfiguration(KtFileScriptSource(ktFile), fromFs.configuration) FromCompilationConfiguration(
KtFileScriptSource(ktFile),
fromFs.configuration.with {
// should be updated from definition because host configuration is transient
hostConfiguration.update { it.withDefaultsFrom(scriptDefinition.hostConfiguration) }
}
)
) )
) )
return fromFs.inputs.isUpToDate(ktFile.project, virtualFile, ktFile) return fromFs.inputs.isUpToDate(ktFile.project, virtualFile, ktFile)