From 955d0841bda2f61749b48de781a0f4f7fc27047d Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Thu, 3 Mar 2022 17:14:28 +0900 Subject: [PATCH] Remove unused modification tracker in KotlinClassInnerStuffCache 'dropCaches()' is not used anywhere both in the compiler and in the IDE. --- .../classes/KtLightClassForDecompiledDeclaration.kt | 2 +- .../light/classes/symbol/classes/FirLightClassBase.kt | 2 +- .../asJava/classes/KotlinClassInnerStuffCache.kt | 10 +--------- .../kotlin/asJava/classes/KtLightClassBase.kt | 2 +- .../asJava/classes/KtLightClassForSourceDeclaration.kt | 2 +- 5 files changed, 5 insertions(+), 13 deletions(-) diff --git a/analysis/decompiled/light-classes-for-decompiled/src/org/jetbrains/kotlin/analysis/decompiled/light/classes/KtLightClassForDecompiledDeclaration.kt b/analysis/decompiled/light-classes-for-decompiled/src/org/jetbrains/kotlin/analysis/decompiled/light/classes/KtLightClassForDecompiledDeclaration.kt index 2413db64e14..2d3e3645756 100644 --- a/analysis/decompiled/light-classes-for-decompiled/src/org/jetbrains/kotlin/analysis/decompiled/light/classes/KtLightClassForDecompiledDeclaration.kt +++ b/analysis/decompiled/light-classes-for-decompiled/src/org/jetbrains/kotlin/analysis/decompiled/light/classes/KtLightClassForDecompiledDeclaration.kt @@ -30,7 +30,7 @@ open class KtLightClassForDecompiledDeclaration( private val myInnersCache = KotlinClassInnerStuffCache( myClass = this, - externalDependencies = listOf(KotlinModificationTrackerService.getInstance(manager.project).outOfBlockModificationTracker), + dependencies = listOf(KotlinModificationTrackerService.getInstance(manager.project).outOfBlockModificationTracker), lazyCreator = LightClassesLazyCreator(project) ) diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/FirLightClassBase.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/FirLightClassBase.kt index 10e05336f4e..a525eee8cb3 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/FirLightClassBase.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/FirLightClassBase.kt @@ -66,7 +66,7 @@ abstract class FirLightClassBase protected constructor(manager: PsiManager) : Li private val myInnersCache = KotlinClassInnerStuffCache( myClass = this@FirLightClassBase, - externalDependencies = listOf(manager.project.createProjectWideOutOfBlockModificationTracker()), + dependencies = listOf(manager.project.createProjectWideOutOfBlockModificationTracker()), lazyCreator = FirLightClassesLazyCreator(project) ) diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KotlinClassInnerStuffCache.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KotlinClassInnerStuffCache.kt index d9451a32011..cc534c77946 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KotlinClassInnerStuffCache.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KotlinClassInnerStuffCache.kt @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.asJava.classes import com.intellij.openapi.diagnostic.Logger -import com.intellij.openapi.util.SimpleModificationTracker import com.intellij.psi.* import com.intellij.psi.impl.PsiClassImplUtil import com.intellij.psi.impl.PsiImplUtil @@ -21,12 +20,9 @@ import org.jetbrains.kotlin.utils.SmartList class KotlinClassInnerStuffCache( private val myClass: PsiExtensibleClass, - externalDependencies: List, + private val dependencies: List, private val lazyCreator: LazyCreator, ) { - private val myTracker = SimpleModificationTracker() - private val dependencies: List = externalDependencies + myTracker - abstract class LazyCreator { abstract fun get(initializer: () -> T, dependencies: List): Lazy } @@ -182,10 +178,6 @@ class KotlinClassInnerStuffCache( } } - fun dropCaches() { - myTracker.incModificationCount() - } - companion object { private const val VALUES_METHOD = "values" private const val VALUE_OF_METHOD = "valueOf" diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassBase.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassBase.kt index 2bc6b82178b..e79ec8b167f 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassBase.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassBase.kt @@ -32,7 +32,7 @@ abstract class KtLightClassBase protected constructor(manager: PsiManager) : AbstractLightClass(manager, KotlinLanguage.INSTANCE), KtLightClass, PsiExtensibleClass { protected open val myInnersCache = KotlinClassInnerStuffCache( myClass = this, - externalDependencies = listOf(KotlinModificationTrackerService.getInstance(manager.project).outOfBlockModificationTracker), + dependencies = listOf(KotlinModificationTrackerService.getInstance(manager.project).outOfBlockModificationTracker), lazyCreator = LightClassesLazyCreator(project) ) diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt index 64fd436fda4..e45f86ffaa1 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt @@ -74,7 +74,7 @@ abstract class KtLightClassForSourceDeclaration( override val myInnersCache: KotlinClassInnerStuffCache = KotlinClassInnerStuffCache( myClass = this, - externalDependencies = classOrObject.getExternalDependencies(), + dependencies = classOrObject.getExternalDependencies(), lazyCreator = LightClassesLazyCreator(project) )