[SLC] rename SymbolLightClassForClassOrObject to SymbolLightClassForClassLike
^KT-54051
This commit is contained in:
committed by
Space Team
parent
1b185bc263
commit
e5e4c2eb59
+1
-1
@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.light.classes.symbol.annotations.hasJvmFieldAnnotati
|
|||||||
import org.jetbrains.kotlin.light.classes.symbol.fields.SymbolLightField
|
import org.jetbrains.kotlin.light.classes.symbol.fields.SymbolLightField
|
||||||
import org.jetbrains.kotlin.psi.KtClassOrObject
|
import org.jetbrains.kotlin.psi.KtClassOrObject
|
||||||
|
|
||||||
internal class SymbolLightAnonymousClass : SymbolLightClassForClassOrObject<KtAnonymousObjectSymbol>, PsiAnonymousClass {
|
internal class SymbolLightAnonymousClass : SymbolLightClassForClassLike<KtAnonymousObjectSymbol>, PsiAnonymousClass {
|
||||||
constructor(
|
constructor(
|
||||||
anonymousObjectDeclaration: KtClassOrObject,
|
anonymousObjectDeclaration: KtClassOrObject,
|
||||||
ktModule: KtModule,
|
ktModule: KtModule,
|
||||||
|
|||||||
+4
-4
@@ -35,7 +35,7 @@ import org.jetbrains.kotlin.psi.debugText.getDebugText
|
|||||||
import org.jetbrains.kotlin.psi.stubs.KotlinClassOrObjectStub
|
import org.jetbrains.kotlin.psi.stubs.KotlinClassOrObjectStub
|
||||||
import org.jetbrains.kotlin.utils.addToStdlib.ifTrue
|
import org.jetbrains.kotlin.utils.addToStdlib.ifTrue
|
||||||
|
|
||||||
abstract class SymbolLightClassForClassOrObject<SType : KtClassOrObjectSymbol> protected constructor(
|
abstract class SymbolLightClassForClassLike<SType : KtClassOrObjectSymbol> protected constructor(
|
||||||
internal val classOrObjectDeclaration: KtClassOrObject?,
|
internal val classOrObjectDeclaration: KtClassOrObject?,
|
||||||
internal val classOrObjectSymbolPointer: KtSymbolPointer<SType>,
|
internal val classOrObjectSymbolPointer: KtSymbolPointer<SType>,
|
||||||
ktModule: KtModule,
|
ktModule: KtModule,
|
||||||
@@ -141,7 +141,7 @@ abstract class SymbolLightClassForClassOrObject<SType : KtClassOrObjectSymbol> p
|
|||||||
|
|
||||||
private val _ownInnerClasses: List<SymbolLightClassBase> by lazyPub {
|
private val _ownInnerClasses: List<SymbolLightClassBase> by lazyPub {
|
||||||
withClassOrObjectSymbol {
|
withClassOrObjectSymbol {
|
||||||
it.createInnerClasses(manager, this@SymbolLightClassForClassOrObject, classOrObjectDeclaration)
|
it.createInnerClasses(manager, this@SymbolLightClassForClassLike, classOrObjectDeclaration)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -159,7 +159,7 @@ abstract class SymbolLightClassForClassOrObject<SType : KtClassOrObjectSymbol> p
|
|||||||
|
|
||||||
override fun equals(other: Any?): Boolean {
|
override fun equals(other: Any?): Boolean {
|
||||||
if (this === other) return true
|
if (this === other) return true
|
||||||
if (other !is SymbolLightClassForClassOrObject<*> || other.ktModule != ktModule || other.manager != manager) return false
|
if (other !is SymbolLightClassForClassLike<*> || other.ktModule != ktModule || other.manager != manager) return false
|
||||||
if (classOrObjectDeclaration != null) {
|
if (classOrObjectDeclaration != null) {
|
||||||
return other.classOrObjectDeclaration == classOrObjectDeclaration
|
return other.classOrObjectDeclaration == classOrObjectDeclaration
|
||||||
}
|
}
|
||||||
@@ -218,5 +218,5 @@ abstract class SymbolLightClassForClassOrObject<SType : KtClassOrObjectSymbol> p
|
|||||||
override fun isInheritorDeep(baseClass: PsiClass?, classToByPass: PsiClass?): Boolean =
|
override fun isInheritorDeep(baseClass: PsiClass?, classToByPass: PsiClass?): Boolean =
|
||||||
baseClass?.let { InheritanceImplUtil.isInheritorDeep(this, it, classToByPass) } ?: false
|
baseClass?.let { InheritanceImplUtil.isInheritorDeep(this, it, classToByPass) } ?: false
|
||||||
|
|
||||||
abstract override fun copy(): SymbolLightClassForClassOrObject<*>
|
abstract override fun copy(): SymbolLightClassForClassLike<*>
|
||||||
}
|
}
|
||||||
+1
-1
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.light.classes.symbol.fields.SymbolLightFieldForPrope
|
|||||||
import org.jetbrains.kotlin.psi.KtClassOrObject
|
import org.jetbrains.kotlin.psi.KtClassOrObject
|
||||||
import org.jetbrains.kotlin.utils.addToStdlib.applyIf
|
import org.jetbrains.kotlin.utils.addToStdlib.applyIf
|
||||||
|
|
||||||
abstract class SymbolLightClassForNamedClassOrObject : SymbolLightClassForClassOrObject<KtNamedClassOrObjectSymbol> {
|
abstract class SymbolLightClassForNamedClassOrObject : SymbolLightClassForClassLike<KtNamedClassOrObjectSymbol> {
|
||||||
constructor(
|
constructor(
|
||||||
ktAnalysisSession: KtAnalysisSession,
|
ktAnalysisSession: KtAnalysisSession,
|
||||||
ktModule: KtModule,
|
ktModule: KtModule,
|
||||||
|
|||||||
+4
-4
@@ -101,7 +101,7 @@ private fun lightClassForEnumEntry(ktEnumEntry: KtEnumEntry): KtLightClass? {
|
|||||||
}
|
}
|
||||||
|
|
||||||
context(ktAnalysisSession@KtAnalysisSession)
|
context(ktAnalysisSession@KtAnalysisSession)
|
||||||
internal fun SymbolLightClassForClassOrObject<*>.createConstructors(
|
internal fun SymbolLightClassForClassLike<*>.createConstructors(
|
||||||
declarations: Sequence<KtConstructorSymbol>,
|
declarations: Sequence<KtConstructorSymbol>,
|
||||||
result: MutableList<KtLightMethod>,
|
result: MutableList<KtLightMethod>,
|
||||||
) {
|
) {
|
||||||
@@ -158,7 +158,7 @@ private fun SymbolLightClassBase.shouldGenerateNoArgOverload(
|
|||||||
!primaryConstructor.hasJvmOverloadsAnnotation()
|
!primaryConstructor.hasJvmOverloadsAnnotation()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun SymbolLightClassForClassOrObject<*>.defaultConstructor(): KtLightMethod {
|
private fun SymbolLightClassForClassLike<*>.defaultConstructor(): KtLightMethod {
|
||||||
val classOrObject = kotlinOrigin
|
val classOrObject = kotlinOrigin
|
||||||
val visibility = when {
|
val visibility = when {
|
||||||
isObject || isEnum -> PsiModifier.PRIVATE
|
isObject || isEnum -> PsiModifier.PRIVATE
|
||||||
@@ -170,7 +170,7 @@ private fun SymbolLightClassForClassOrObject<*>.defaultConstructor(): KtLightMet
|
|||||||
return noArgConstructor(visibility, METHOD_INDEX_FOR_DEFAULT_CTOR)
|
return noArgConstructor(visibility, METHOD_INDEX_FOR_DEFAULT_CTOR)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun SymbolLightClassForClassOrObject<*>.noArgConstructor(
|
private fun SymbolLightClassForClassLike<*>.noArgConstructor(
|
||||||
visibility: String,
|
visibility: String,
|
||||||
methodIndex: Int,
|
methodIndex: Int,
|
||||||
): KtLightMethod = SymbolLightNoArgConstructor(
|
): KtLightMethod = SymbolLightNoArgConstructor(
|
||||||
@@ -381,7 +381,7 @@ internal fun SymbolLightClassBase.createField(
|
|||||||
}
|
}
|
||||||
|
|
||||||
context(KtAnalysisSession)
|
context(KtAnalysisSession)
|
||||||
internal fun SymbolLightClassForClassOrObject<*>.createInheritanceList(
|
internal fun SymbolLightClassForClassLike<*>.createInheritanceList(
|
||||||
forExtendsList: Boolean,
|
forExtendsList: Boolean,
|
||||||
superTypes: List<KtType>,
|
superTypes: List<KtType>,
|
||||||
): PsiReferenceList {
|
): PsiReferenceList {
|
||||||
|
|||||||
+3
-3
@@ -19,12 +19,12 @@ import org.jetbrains.kotlin.asJava.classes.lazyPub
|
|||||||
import org.jetbrains.kotlin.light.classes.symbol.*
|
import org.jetbrains.kotlin.light.classes.symbol.*
|
||||||
import org.jetbrains.kotlin.light.classes.symbol.annotations.SymbolLightSimpleAnnotation
|
import org.jetbrains.kotlin.light.classes.symbol.annotations.SymbolLightSimpleAnnotation
|
||||||
import org.jetbrains.kotlin.light.classes.symbol.annotations.hasDeprecatedAnnotation
|
import org.jetbrains.kotlin.light.classes.symbol.annotations.hasDeprecatedAnnotation
|
||||||
import org.jetbrains.kotlin.light.classes.symbol.classes.SymbolLightClassForClassOrObject
|
import org.jetbrains.kotlin.light.classes.symbol.classes.SymbolLightClassForClassLike
|
||||||
import org.jetbrains.kotlin.light.classes.symbol.modifierLists.SymbolLightMemberModifierList
|
import org.jetbrains.kotlin.light.classes.symbol.modifierLists.SymbolLightMemberModifierList
|
||||||
import org.jetbrains.kotlin.psi.KtObjectDeclaration
|
import org.jetbrains.kotlin.psi.KtObjectDeclaration
|
||||||
|
|
||||||
internal class SymbolLightFieldForObject private constructor(
|
internal class SymbolLightFieldForObject private constructor(
|
||||||
containingClass: SymbolLightClassForClassOrObject<*>,
|
containingClass: SymbolLightClassForClassLike<*>,
|
||||||
private val name: String,
|
private val name: String,
|
||||||
lightMemberOrigin: LightMemberOrigin?,
|
lightMemberOrigin: LightMemberOrigin?,
|
||||||
private val objectSymbolPointer: KtSymbolPointer<KtNamedClassOrObjectSymbol>,
|
private val objectSymbolPointer: KtSymbolPointer<KtNamedClassOrObjectSymbol>,
|
||||||
@@ -35,7 +35,7 @@ internal class SymbolLightFieldForObject private constructor(
|
|||||||
objectSymbol: KtNamedClassOrObjectSymbol,
|
objectSymbol: KtNamedClassOrObjectSymbol,
|
||||||
name: String,
|
name: String,
|
||||||
lightMemberOrigin: LightMemberOrigin?,
|
lightMemberOrigin: LightMemberOrigin?,
|
||||||
containingClass: SymbolLightClassForClassOrObject<*>,
|
containingClass: SymbolLightClassForClassLike<*>,
|
||||||
) : this(
|
) : this(
|
||||||
containingClass = containingClass,
|
containingClass = containingClass,
|
||||||
name = name,
|
name = name,
|
||||||
|
|||||||
+2
-2
@@ -8,13 +8,13 @@ package org.jetbrains.kotlin.light.classes.symbol.methods
|
|||||||
import com.intellij.psi.*
|
import com.intellij.psi.*
|
||||||
import org.jetbrains.kotlin.asJava.builder.LightMemberOrigin
|
import org.jetbrains.kotlin.asJava.builder.LightMemberOrigin
|
||||||
import org.jetbrains.kotlin.asJava.elements.KtLightIdentifier
|
import org.jetbrains.kotlin.asJava.elements.KtLightIdentifier
|
||||||
import org.jetbrains.kotlin.light.classes.symbol.classes.SymbolLightClassForClassOrObject
|
import org.jetbrains.kotlin.light.classes.symbol.classes.SymbolLightClassForClassLike
|
||||||
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.parameters.SymbolLightParameterList
|
import org.jetbrains.kotlin.light.classes.symbol.parameters.SymbolLightParameterList
|
||||||
|
|
||||||
internal class SymbolLightNoArgConstructor(
|
internal class SymbolLightNoArgConstructor(
|
||||||
lightMemberOrigin: LightMemberOrigin?,
|
lightMemberOrigin: LightMemberOrigin?,
|
||||||
containingClass: SymbolLightClassForClassOrObject<*>,
|
containingClass: SymbolLightClassForClassLike<*>,
|
||||||
private val visibility: String,
|
private val visibility: String,
|
||||||
methodIndex: Int,
|
methodIndex: Int,
|
||||||
) : SymbolLightMethodBase(lightMemberOrigin, containingClass, methodIndex) {
|
) : SymbolLightMethodBase(lightMemberOrigin, containingClass, methodIndex) {
|
||||||
|
|||||||
Reference in New Issue
Block a user