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

Clear internal caches in PerModulePackageCacheService on dispose (KT-33802)

Browse Source
This commit is contained in:
Nikolay Krasko
2019-09-17 14:46:56 +03:00
parent 4387862d20
commit 220a8f2872
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/PerModulePackageCacheService.kt
+18 -7
View File
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.idea.caches package org.jetbrains.kotlin.idea.caches
import com.intellij.ProjectTopics import com.intellij.ProjectTopics
import com.intellij.openapi.Disposable
import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.components.ServiceManager import com.intellij.openapi.components.ServiceManager
import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.diagnostic.Logger
@@ -29,6 +30,7 @@ import com.intellij.psi.impl.PsiTreeChangePreprocessor
import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.GlobalSearchScope
import com.intellij.util.containers.ContainerUtil import com.intellij.util.containers.ContainerUtil
import org.jetbrains.kotlin.idea.KotlinFileType import org.jetbrains.kotlin.idea.KotlinFileType
import org.jetbrains.kotlin.idea.caches.PerModulePackageCacheService.Companion.DEBUG_LOG_ENABLE_PerModulePackageCache
import org.jetbrains.kotlin.idea.caches.PerModulePackageCacheService.Companion.FULL_DROP_THRESHOLD import org.jetbrains.kotlin.idea.caches.PerModulePackageCacheService.Companion.FULL_DROP_THRESHOLD
import org.jetbrains.kotlin.idea.caches.project.ModuleSourceInfo import org.jetbrains.kotlin.idea.caches.project.ModuleSourceInfo
import org.jetbrains.kotlin.idea.caches.project.getModuleInfoByVirtualFile import org.jetbrains.kotlin.idea.caches.project.getModuleInfoByVirtualFile
@@ -44,7 +46,6 @@ import org.jetbrains.kotlin.psi.psiUtil.getChildrenOfType
import org.jetbrains.kotlin.psi.psiUtil.getParentOfType import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.ConcurrentMap import java.util.concurrent.ConcurrentMap
import org.jetbrains.kotlin.idea.caches.PerModulePackageCacheService.Companion.DEBUG_LOG_ENABLE_PerModulePackageCache
class KotlinPackageContentModificationListener(private val project: Project) { class KotlinPackageContentModificationListener(private val project: Project) {
init { init {
@@ -217,7 +218,7 @@ class ImplicitPackagePrefixCache(private val project: Project) {
} }
} }
class PerModulePackageCacheService(private val project: Project) { class PerModulePackageCacheService(private val project: Project) : Disposable {
/* /*
* Actually an WeakMap<Module, SoftMap<ModuleSourceInfo, SoftMap<FqName, Boolean>>> * Actually an WeakMap<Module, SoftMap<ModuleSourceInfo, SoftMap<FqName, Boolean>>>
@@ -230,11 +231,17 @@ class PerModulePackageCacheService(private val project: Project) {
private val projectScope = GlobalSearchScope.projectScope(project) private val projectScope = GlobalSearchScope.projectScope(project)
internal fun onTooComplexChange(): Unit = synchronized(this) { internal fun onTooComplexChange() {
pendingVFileChanges.clear() clear()
pendingKtFileChanges.clear() }
cache.clear()
implicitPackagePrefixCache.clear() private fun clear() {
synchronized(this) {
pendingVFileChanges.clear()
pendingKtFileChanges.clear()
cache.clear()
implicitPackagePrefixCache.clear()
}
} }
internal fun notifyPackageChange(file: VFileEvent): Unit = synchronized(this) { internal fun notifyPackageChange(file: VFileEvent): Unit = synchronized(this) {
@@ -341,6 +348,10 @@ class PerModulePackageCacheService(private val project: Project) {
return implicitPackagePrefixCache.getPrefix(sourceRoot) return implicitPackagePrefixCache.getPrefix(sourceRoot)
} }
override fun dispose() {
clear()
}
companion object { companion object {
const val FULL_DROP_THRESHOLD = 1000 const val FULL_DROP_THRESHOLD = 1000
private val LOG = Logger.getInstance(this::class.java) private val LOG = Logger.getInstance(this::class.java)