From 74ad591dcbc66d844386bee6465eeca98cb73577 Mon Sep 17 00:00:00 2001 From: Dmitry Gridin Date: Tue, 9 Aug 2022 12:09:00 +0200 Subject: [PATCH] [slc] rename fir to symbol ^KT-50241 --- ...onClassSymbol.kt => SymbolLightAnnotationClass.kt} | 11 +++++++---- ...ClassForSymbol.kt => SymbolLightAnonymousClass.kt} | 6 +++--- .../classes/symbol/classes/symbolLightClassUtils.kt | 4 ++-- 3 files changed, 12 insertions(+), 9 deletions(-) rename analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/{SymbolLightAnnotationClassSymbol.kt => SymbolLightAnnotationClass.kt} (82%) rename analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/{SymbolLightAnonymousClassForSymbol.kt => SymbolLightAnonymousClass.kt} (96%) diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightAnnotationClassSymbol.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightAnnotationClass.kt similarity index 82% rename from analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightAnnotationClassSymbol.kt rename to analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightAnnotationClass.kt index c8c84bfd1e9..aba9ba518a5 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightAnnotationClassSymbol.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightAnnotationClass.kt @@ -10,14 +10,17 @@ import com.intellij.psi.PsiMethod import com.intellij.psi.PsiReferenceList import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.lifetime.isValid -import org.jetbrains.kotlin.analysis.api.symbols.* +import org.jetbrains.kotlin.analysis.api.symbols.KtClassKind +import org.jetbrains.kotlin.analysis.api.symbols.KtConstructorSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtFunctionSymbol +import org.jetbrains.kotlin.analysis.api.symbols.KtNamedClassOrObjectSymbol import org.jetbrains.kotlin.analysis.api.symbols.markers.isPrivateOrPrivateToThis import org.jetbrains.kotlin.asJava.classes.lazyPub import org.jetbrains.kotlin.asJava.elements.KtLightField import org.jetbrains.kotlin.asJava.elements.KtLightMethod context(KtAnalysisSession) -internal class SymbolLightAnnotationClassSymbol( +internal class SymbolLightAnnotationClass( private val classOrObjectSymbol: KtNamedClassOrObjectSymbol, manager: PsiManager ) : SymbolLightInterfaceOrAnnotationClass(classOrObjectSymbol, manager) { @@ -51,12 +54,12 @@ internal class SymbolLightAnnotationClassSymbol( override fun getExtendsList(): PsiReferenceList? = null override fun equals(other: Any?): Boolean = - other is SymbolLightAnnotationClassSymbol && classOrObjectSymbol == other.classOrObjectSymbol + other is SymbolLightAnnotationClass && classOrObjectSymbol == other.classOrObjectSymbol override fun hashCode(): Int = classOrObjectSymbol.hashCode() override fun isValid(): Boolean = super.isValid() && classOrObjectSymbol.isValid() - override fun copy(): SymbolLightClassForClassOrObject = SymbolLightAnnotationClassSymbol(classOrObjectSymbol, manager) + override fun copy(): SymbolLightClassForClassOrObject = SymbolLightAnnotationClass(classOrObjectSymbol, manager) } diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightAnonymousClassForSymbol.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightAnonymousClass.kt similarity index 96% rename from analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightAnonymousClassForSymbol.kt rename to analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightAnonymousClass.kt index efa509821c4..a92e0f3b2f4 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightAnonymousClassForSymbol.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightAnonymousClass.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.psi.debugText.getDebugText import org.jetbrains.kotlin.psi.stubs.KotlinClassOrObjectStub context(KtAnalysisSession) -internal class SymbolLightAnonymousClassForSymbol( +internal class SymbolLightAnonymousClass( private val anonymousObjectSymbol: KtAnonymousObjectSymbol, manager: PsiManager ) : SymbolLightClassBase(manager), @@ -139,12 +139,12 @@ internal class SymbolLightAnonymousClassForSymbol( override fun equals(other: Any?): Boolean = this === other || - (other is SymbolLightAnonymousClassForSymbol && anonymousObjectSymbol == other.anonymousObjectSymbol) + (other is SymbolLightAnonymousClass && anonymousObjectSymbol == other.anonymousObjectSymbol) override fun hashCode(): Int = anonymousObjectSymbol.hashCode() override fun copy() = - SymbolLightAnonymousClassForSymbol(anonymousObjectSymbol, manager) + SymbolLightAnonymousClass(anonymousObjectSymbol, manager) override fun isValid(): Boolean = super.isValid() && anonymousObjectSymbol.isValid() diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/symbolLightClassUtils.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/symbolLightClassUtils.kt index b3cf9bbab23..c7e344361ec 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/symbolLightClassUtils.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/symbolLightClassUtils.kt @@ -101,10 +101,10 @@ internal fun createSymbolLightClassNoCache(classOrObject: KtClassOrObject): KtLi context(KtAnalysisSession) internal fun KtClassOrObjectSymbol.createLightClassNoCache(manager: PsiManager): SymbolLightClassBase = when (this) { - is KtAnonymousObjectSymbol -> SymbolLightAnonymousClassForSymbol(this, manager) + is KtAnonymousObjectSymbol -> SymbolLightAnonymousClass(this, manager) is KtNamedClassOrObjectSymbol -> when (classKind) { KtClassKind.INTERFACE -> SymbolLightInterfaceClass(this, manager) - KtClassKind.ANNOTATION_CLASS -> SymbolLightAnnotationClassSymbol(this, manager) + KtClassKind.ANNOTATION_CLASS -> SymbolLightAnnotationClass(this, manager) else -> SymbolLightClass(this, manager) } }