From de76d75f031a2c9b7bd4a561501c688731050df3 Mon Sep 17 00:00:00 2001 From: Natalia Selezneva Date: Mon, 19 Feb 2018 15:27:34 +0300 Subject: [PATCH] Drop caches for synthetic files when dependencies changed --- .../idea/caches/resolve/KotlinCacheServiceImpl.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheServiceImpl.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheServiceImpl.kt index 63ef84b1dd3..f1d39be0e33 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheServiceImpl.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheServiceImpl.kt @@ -32,8 +32,6 @@ import org.jetbrains.kotlin.analyzer.ModuleInfo import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.caches.resolve.KotlinCacheService import org.jetbrains.kotlin.config.LanguageFeature -import org.jetbrains.kotlin.container.getService -import org.jetbrains.kotlin.container.tryGetService import org.jetbrains.kotlin.context.GlobalContext import org.jetbrains.kotlin.context.GlobalContextImpl import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor @@ -188,7 +186,13 @@ class KotlinCacheServiceImpl(val project: Project) : KotlinCacheService { files.sumByLong { it.outOfBlockModificationCount + it.modificationStamp } } } - val dependenciesForSyntheticFileCache = listOf(PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT, filesModificationTracker) + + val dependenciesForSyntheticFileCache = listOf( + PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT, + filesModificationTracker, + ScriptDependenciesModificationTracker.getInstance(project) + ) + val resolverDebugName = "completion/highlighting in $syntheticFileModule for files ${files.joinToString { it.name }} for platform $targetPlatform" fun makeProjectResolutionFacade(debugName: String,