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

Drop modification stamps for gradle scripts after project import

Browse Source 
^KT-36763 Fixed
This commit is contained in:
Natalia Selezneva
2020-02-17 12:03:42 +03:00
parent 61f5523805
commit d063dbef10
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptInputsWatcher.kt
+4
View File
@@ -49,6 +49,10 @@ class GradleScriptInputsWatcher(val project: Project) : PersistentStateComponent
storage.fileChanged(filePath, ts) storage.fileChanged(filePath, ts)
} }
fun clearState() {
storage = Storage()
}
@TestOnly @TestOnly
fun clearAndRefillState() { fun clearAndRefillState() {
loadState(project.service<GradleScriptInputsWatcher>().state) loadState(project.service<GradleScriptInputsWatcher>().state)
idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelDataService.kt
+2
View File
@@ -25,6 +25,7 @@ import com.intellij.pom.Navigatable
import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager
import org.jetbrains.kotlin.idea.core.script.configuration.cache.CachedConfigurationInputs import org.jetbrains.kotlin.idea.core.script.configuration.cache.CachedConfigurationInputs
import org.jetbrains.kotlin.idea.core.script.configuration.cache.ScriptConfigurationSnapshot import org.jetbrains.kotlin.idea.core.script.configuration.cache.ScriptConfigurationSnapshot
import org.jetbrains.kotlin.idea.scripting.gradle.GradleScriptInputsWatcher
import org.jetbrains.kotlin.idea.scripting.gradle.getGradleScriptInputsStamp import org.jetbrains.kotlin.idea.scripting.gradle.getGradleScriptInputsStamp
import org.jetbrains.kotlin.idea.scripting.gradle.saveGradleProjectRootsAfterImport import org.jetbrains.kotlin.idea.scripting.gradle.saveGradleProjectRootsAfterImport
import org.jetbrains.kotlin.scripting.definitions.findScriptDefinition import org.jetbrains.kotlin.scripting.definitions.findScriptDefinition
@@ -106,6 +107,7 @@ class KotlinDslScriptModelDataService : AbstractProjectDataService<ProjectData,
} }
project.service<ScriptConfigurationManager>().saveCompilationConfigurationAfterImport(scriptConfigurations) project.service<ScriptConfigurationManager>().saveCompilationConfigurationAfterImport(scriptConfigurations)
project.service<GradleScriptInputsWatcher>().clearState()
} }
private fun addBuildScriptDiagnosticMessage( private fun addBuildScriptDiagnosticMessage(