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

[slc] rename fir to symbol

Browse Source 
^KT-50241
This commit is contained in:
Dmitry Gridin
2022-08-09 12:09:00 +02:00
parent c0d6a64a8a
commit 74ad591dcb
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightAnnotationClassSymbol.kt → analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightAnnotationClass.kt
+7 -4
View File
@@ -10,14 +10,17 @@ import com.intellij.psi.PsiMethod
import com.intellij.psi.PsiReferenceList import com.intellij.psi.PsiReferenceList
import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
import org.jetbrains.kotlin.analysis.api.lifetime.isValid 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.analysis.api.symbols.markers.isPrivateOrPrivateToThis
import org.jetbrains.kotlin.asJava.classes.lazyPub import org.jetbrains.kotlin.asJava.classes.lazyPub
import org.jetbrains.kotlin.asJava.elements.KtLightField import org.jetbrains.kotlin.asJava.elements.KtLightField
import org.jetbrains.kotlin.asJava.elements.KtLightMethod import org.jetbrains.kotlin.asJava.elements.KtLightMethod
context(KtAnalysisSession) context(KtAnalysisSession)
internal class SymbolLightAnnotationClassSymbol( internal class SymbolLightAnnotationClass(
private val classOrObjectSymbol: KtNamedClassOrObjectSymbol, private val classOrObjectSymbol: KtNamedClassOrObjectSymbol,
manager: PsiManager manager: PsiManager
) : SymbolLightInterfaceOrAnnotationClass(classOrObjectSymbol, manager) { ) : SymbolLightInterfaceOrAnnotationClass(classOrObjectSymbol, manager) {
@@ -51,12 +54,12 @@ internal class SymbolLightAnnotationClassSymbol(
override fun getExtendsList(): PsiReferenceList? = null override fun getExtendsList(): PsiReferenceList? = null
override fun equals(other: Any?): Boolean = 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 hashCode(): Int = classOrObjectSymbol.hashCode()
override fun isValid(): Boolean = super.isValid() && classOrObjectSymbol.isValid() override fun isValid(): Boolean = super.isValid() && classOrObjectSymbol.isValid()
override fun copy(): SymbolLightClassForClassOrObject = SymbolLightAnnotationClassSymbol(classOrObjectSymbol, manager) override fun copy(): SymbolLightClassForClassOrObject = SymbolLightAnnotationClass(classOrObjectSymbol, manager)
} }
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightAnonymousClassForSymbol.kt → analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightAnonymousClass.kt
+3 -3
View File
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.psi.debugText.getDebugText
import org.jetbrains.kotlin.psi.stubs.KotlinClassOrObjectStub import org.jetbrains.kotlin.psi.stubs.KotlinClassOrObjectStub
context(KtAnalysisSession) context(KtAnalysisSession)
internal class SymbolLightAnonymousClassForSymbol( internal class SymbolLightAnonymousClass(
private val anonymousObjectSymbol: KtAnonymousObjectSymbol, private val anonymousObjectSymbol: KtAnonymousObjectSymbol,
manager: PsiManager manager: PsiManager
) : SymbolLightClassBase(manager), ) : SymbolLightClassBase(manager),
@@ -139,12 +139,12 @@ internal class SymbolLightAnonymousClassForSymbol(
override fun equals(other: Any?): Boolean = override fun equals(other: Any?): Boolean =
this === other || this === other ||
(other is SymbolLightAnonymousClassForSymbol && anonymousObjectSymbol == other.anonymousObjectSymbol) (other is SymbolLightAnonymousClass && anonymousObjectSymbol == other.anonymousObjectSymbol)
override fun hashCode(): Int = anonymousObjectSymbol.hashCode() override fun hashCode(): Int = anonymousObjectSymbol.hashCode()
override fun copy() = override fun copy() =
SymbolLightAnonymousClassForSymbol(anonymousObjectSymbol, manager) SymbolLightAnonymousClass(anonymousObjectSymbol, manager)
override fun isValid(): Boolean = super.isValid() && anonymousObjectSymbol.isValid() override fun isValid(): Boolean = super.isValid() && anonymousObjectSymbol.isValid()
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/symbolLightClassUtils.kt
+2 -2
View File
@@ -101,10 +101,10 @@ internal fun createSymbolLightClassNoCache(classOrObject: KtClassOrObject): KtLi
context(KtAnalysisSession) context(KtAnalysisSession)
internal fun KtClassOrObjectSymbol.createLightClassNoCache(manager: PsiManager): SymbolLightClassBase = when (this) { internal fun KtClassOrObjectSymbol.createLightClassNoCache(manager: PsiManager): SymbolLightClassBase = when (this) {
is KtAnonymousObjectSymbol -> SymbolLightAnonymousClassForSymbol(this, manager) is KtAnonymousObjectSymbol -> SymbolLightAnonymousClass(this, manager)
is KtNamedClassOrObjectSymbol -> when (classKind) { is KtNamedClassOrObjectSymbol -> when (classKind) {
KtClassKind.INTERFACE -> SymbolLightInterfaceClass(this, manager) KtClassKind.INTERFACE -> SymbolLightInterfaceClass(this, manager)
KtClassKind.ANNOTATION_CLASS -> SymbolLightAnnotationClassSymbol(this, manager) KtClassKind.ANNOTATION_CLASS -> SymbolLightAnnotationClass(this, manager)
else -> SymbolLightClass(this, manager) else -> SymbolLightClass(this, manager)
} }
} }