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

[SLC] rename SymbolLightClass to SymbolLightClassForClassOrObject

Browse Source 
^KT-54051
This commit is contained in:
Dmitrii Gridin
2022-11-26 17:13:42 +01:00
committed by Space Team
parent e5e4c2eb59
commit dcb59ca615
5 changed files with 11 additions and 11 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/SymbolLightClass.kt → analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForClassOrObject.kt
+3 -3
View File
@@ -46,7 +46,7 @@ import org.jetbrains.kotlin.util.OperatorNameConventions.TO_STRING
import org.jetbrains.kotlin.utils.addIfNotNull import org.jetbrains.kotlin.utils.addIfNotNull
import org.jetbrains.kotlin.utils.addToStdlib.applyIf import org.jetbrains.kotlin.utils.addToStdlib.applyIf
internal open class SymbolLightClass : SymbolLightClassForNamedClassOrObject { internal open class SymbolLightClassForClassOrObject : SymbolLightClassForNamedClassOrObject {
constructor( constructor(
ktAnalysisSession: KtAnalysisSession, ktAnalysisSession: KtAnalysisSession,
ktModule: KtModule, ktModule: KtModule,
@@ -101,7 +101,7 @@ internal open class SymbolLightClass : SymbolLightClassForNamedClassOrObject {
val lazyAnnotations = lazyPub { val lazyAnnotations = lazyPub {
withClassOrObjectSymbol { classOrObjectSymbol -> withClassOrObjectSymbol { classOrObjectSymbol ->
classOrObjectSymbol.computeAnnotations( classOrObjectSymbol.computeAnnotations(
parent = this@SymbolLightClass, parent = this@SymbolLightClassForClassOrObject,
nullability = NullabilityType.Unknown, nullability = NullabilityType.Unknown,
annotationUseSiteTarget = null, annotationUseSiteTarget = null,
) )
@@ -346,5 +346,5 @@ internal open class SymbolLightClass : SymbolLightClassForNamedClassOrObject {
override fun isAnnotationType(): Boolean = false override fun isAnnotationType(): Boolean = false
override fun copy(): SymbolLightClass = SymbolLightClass(classOrObjectDeclaration, classOrObjectSymbolPointer, ktModule, manager) override fun copy(): SymbolLightClassForClassOrObject = SymbolLightClassForClassOrObject(classOrObjectDeclaration, classOrObjectSymbolPointer, ktModule, manager)
} }
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForEnumEntry.kt
+2 -2
View File
@@ -18,9 +18,9 @@ import org.jetbrains.kotlin.light.classes.symbol.modifierLists.SymbolLightClassM
internal class SymbolLightClassForEnumEntry( internal class SymbolLightClassForEnumEntry(
private val enumConstant: SymbolLightFieldForEnumEntry, private val enumConstant: SymbolLightFieldForEnumEntry,
private val enumClass: SymbolLightClass, private val enumClass: SymbolLightClassForClassOrObject,
ktModule: KtModule, ktModule: KtModule,
) : SymbolLightClass( ) : SymbolLightClassForClassOrObject(
enumConstant.kotlinOrigin, enumConstant.kotlinOrigin,
ktModule, ktModule,
), PsiEnumConstantInitializer { ), PsiEnumConstantInitializer {
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightInlineClass.kt
+1 -1
View File
@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.psi.KtClassOrObject
import org.jetbrains.kotlin.resolve.deprecation.DeprecationLevelValue import org.jetbrains.kotlin.resolve.deprecation.DeprecationLevelValue
internal class SymbolLightInlineClass : SymbolLightClass { internal class SymbolLightInlineClass : SymbolLightClassForClassOrObject {
constructor( constructor(
classOrObject: KtClassOrObject, classOrObject: KtClassOrObject,
ktModule: KtModule, ktModule: KtModule,
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/symbolLightClassUtils.kt
+3 -3
View File
@@ -58,7 +58,7 @@ internal fun createLightClassNoCache(ktClassOrObject: KtClassOrObject, ktModule:
ktClassOrObject.hasModifier(INLINE_KEYWORD) -> SymbolLightInlineClass(ktClassOrObject, ktModule) ktClassOrObject.hasModifier(INLINE_KEYWORD) -> SymbolLightInlineClass(ktClassOrObject, ktModule)
ktClassOrObject is KtClass && ktClassOrObject.isAnnotation() -> SymbolLightAnnotationClass(ktClassOrObject, ktModule) ktClassOrObject is KtClass && ktClassOrObject.isAnnotation() -> SymbolLightAnnotationClass(ktClassOrObject, ktModule)
ktClassOrObject is KtClass && ktClassOrObject.isInterface() -> SymbolLightInterfaceClass(ktClassOrObject, ktModule) ktClassOrObject is KtClass && ktClassOrObject.isInterface() -> SymbolLightInterfaceClass(ktClassOrObject, ktModule)
else -> SymbolLightClass(ktClassOrObject, ktModule) else -> SymbolLightClassForClassOrObject(ktClassOrObject, ktModule)
} }
context(ktAnalysisSession@KtAnalysisSession) context(ktAnalysisSession@KtAnalysisSession)
@@ -81,7 +81,7 @@ internal fun createLightClassNoCache(
manager = manager, manager = manager,
) )
else -> SymbolLightClass( else -> SymbolLightClassForClassOrObject(
ktAnalysisSession = this@ktAnalysisSession, ktAnalysisSession = this@ktAnalysisSession,
ktModule = ktModule, ktModule = ktModule,
classOrObjectSymbol = ktClassOrObjectSymbol, classOrObjectSymbol = ktClassOrObjectSymbol,
@@ -92,7 +92,7 @@ internal fun createLightClassNoCache(
private fun lightClassForEnumEntry(ktEnumEntry: KtEnumEntry): KtLightClass? { private fun lightClassForEnumEntry(ktEnumEntry: KtEnumEntry): KtLightClass? {
if (ktEnumEntry.body == null) return null if (ktEnumEntry.body == null) return null
val symbolLightClass = ktEnumEntry.containingClass()?.toLightClass() as? SymbolLightClass ?: return null val symbolLightClass = ktEnumEntry.containingClass()?.toLightClass() as? SymbolLightClassForClassOrObject ?: return null
val targetField = symbolLightClass.ownFields.firstOrNull { val targetField = symbolLightClass.ownFields.firstOrNull {
it is SymbolLightFieldForEnumEntry && it.kotlinOrigin == ktEnumEntry it is SymbolLightFieldForEnumEntry && it.kotlinOrigin == ktEnumEntry
} ?: return null } ?: return null
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/fields/SymbolLightFieldForEnumEntry.kt
+2 -2
View File
@@ -14,7 +14,7 @@ import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
import org.jetbrains.kotlin.light.classes.symbol.NullabilityType import org.jetbrains.kotlin.light.classes.symbol.NullabilityType
import org.jetbrains.kotlin.light.classes.symbol.analyzeForLightClasses import org.jetbrains.kotlin.light.classes.symbol.analyzeForLightClasses
import org.jetbrains.kotlin.light.classes.symbol.annotations.computeAnnotations import org.jetbrains.kotlin.light.classes.symbol.annotations.computeAnnotations
import org.jetbrains.kotlin.light.classes.symbol.classes.SymbolLightClass import org.jetbrains.kotlin.light.classes.symbol.classes.SymbolLightClassForClassOrObject
import org.jetbrains.kotlin.light.classes.symbol.classes.SymbolLightClassForEnumEntry import org.jetbrains.kotlin.light.classes.symbol.classes.SymbolLightClassForEnumEntry
import org.jetbrains.kotlin.light.classes.symbol.modifierLists.SymbolLightMemberModifierList import org.jetbrains.kotlin.light.classes.symbol.modifierLists.SymbolLightMemberModifierList
import org.jetbrains.kotlin.light.classes.symbol.nonExistentType import org.jetbrains.kotlin.light.classes.symbol.nonExistentType
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.utils.addToStdlib.ifTrue
internal class SymbolLightFieldForEnumEntry( internal class SymbolLightFieldForEnumEntry(
private val enumEntry: KtEnumEntry, private val enumEntry: KtEnumEntry,
private val enumEntryName: String, private val enumEntryName: String,
containingClass: SymbolLightClass, containingClass: SymbolLightClassForClassOrObject,
) : SymbolLightField(containingClass = containingClass, lightMemberOrigin = null), PsiEnumConstant { ) : SymbolLightField(containingClass = containingClass, lightMemberOrigin = null), PsiEnumConstant {
internal fun <T> withEnumEntrySymbol(action: KtAnalysisSession.(KtEnumEntrySymbol) -> T): T = analyzeForLightClasses(ktModule) { internal fun <T> withEnumEntrySymbol(action: KtAnalysisSession.(KtEnumEntrySymbol) -> T): T = analyzeForLightClasses(ktModule) {
action(enumEntry.getEnumEntrySymbol()) action(enumEntry.getEnumEntrySymbol())