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

[SLC] rename SymbolLightInterfaceClass to SymbolLightClassForInterface

Browse Source 
^KT-54051
This commit is contained in:
Dmitrii Gridin
2022-11-26 17:15:55 +01:00
committed by Space Team
parent 02fd371c97
commit ed43dc9530
3 changed files with 8 additions and 8 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/SymbolLightInterfaceClass.kt → analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForInterface.kt
+3 -3
View File
@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.asJava.elements.KtLightMethod
import org.jetbrains.kotlin.psi.KtClass import org.jetbrains.kotlin.psi.KtClass
import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.psi.KtClassOrObject
internal open class SymbolLightInterfaceClass : SymbolLightClassForInterfaceOrAnnotationClass { internal open class SymbolLightClassForInterface : SymbolLightClassForInterfaceOrAnnotationClass {
constructor( constructor(
ktAnalysisSession: KtAnalysisSession, ktAnalysisSession: KtAnalysisSession,
ktModule: KtModule, ktModule: KtModule,
@@ -67,8 +67,8 @@ internal open class SymbolLightInterfaceClass : SymbolLightClassForInterfaceOrAn
override fun getOwnMethods(): List<PsiMethod> = _ownMethods override fun getOwnMethods(): List<PsiMethod> = _ownMethods
override fun copy(): SymbolLightInterfaceClass = override fun copy(): SymbolLightClassForInterface =
SymbolLightInterfaceClass(classOrObjectDeclaration, classOrObjectSymbolPointer, ktModule, manager) SymbolLightClassForInterface(classOrObjectDeclaration, classOrObjectSymbolPointer, ktModule, manager)
private val _extendsList: PsiReferenceList by lazyPub { private val _extendsList: PsiReferenceList by lazyPub {
withClassOrObjectSymbol { classOrObjectSymbol -> withClassOrObjectSymbol { classOrObjectSymbol ->
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForInterfaceDefaultImpls.kt
+2 -2
View File
@@ -10,8 +10,8 @@ import com.intellij.util.IncorrectOperationException
import org.jetbrains.kotlin.light.classes.symbol.modifierLists.SymbolLightClassModifierList import org.jetbrains.kotlin.light.classes.symbol.modifierLists.SymbolLightClassModifierList
import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.load.java.JvmAbi
internal class SymbolLightClassForInterfaceDefaultImpls(private val containingClass: SymbolLightInterfaceClass) : internal class SymbolLightClassForInterfaceDefaultImpls(private val containingClass: SymbolLightClassForInterface) :
SymbolLightInterfaceClass( SymbolLightClassForInterface(
containingClass.classOrObjectDeclaration, containingClass.classOrObjectDeclaration,
containingClass.classOrObjectSymbolPointer, containingClass.classOrObjectSymbolPointer,
containingClass.ktModule, containingClass.ktModule,
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/symbolLightClassUtils.kt
+3 -3
View File
@@ -57,7 +57,7 @@ internal fun createSymbolLightClassNoCache(classOrObject: KtClassOrObject, ktMod
internal fun createLightClassNoCache(ktClassOrObject: KtClassOrObject, ktModule: KtModule): SymbolLightClassBase = when { internal fun createLightClassNoCache(ktClassOrObject: KtClassOrObject, ktModule: KtModule): SymbolLightClassBase = when {
ktClassOrObject.hasModifier(INLINE_KEYWORD) -> SymbolLightClassForInlineClass(ktClassOrObject, ktModule) ktClassOrObject.hasModifier(INLINE_KEYWORD) -> SymbolLightClassForInlineClass(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() -> SymbolLightClassForInterface(ktClassOrObject, ktModule)
else -> SymbolLightClassForClassOrObject(ktClassOrObject, ktModule) else -> SymbolLightClassForClassOrObject(ktClassOrObject, ktModule)
} }
@@ -67,7 +67,7 @@ internal fun createLightClassNoCache(
ktModule: KtModule, ktModule: KtModule,
manager: PsiManager, manager: PsiManager,
): SymbolLightClassBase = when (ktClassOrObjectSymbol.classKind) { ): SymbolLightClassBase = when (ktClassOrObjectSymbol.classKind) {
KtClassKind.INTERFACE -> SymbolLightInterfaceClass( KtClassKind.INTERFACE -> SymbolLightClassForInterface(
ktAnalysisSession = this@ktAnalysisSession, ktAnalysisSession = this@ktAnalysisSession,
ktModule = ktModule, ktModule = ktModule,
classOrObjectSymbol = ktClassOrObjectSymbol, classOrObjectSymbol = ktClassOrObjectSymbol,
@@ -463,7 +463,7 @@ internal fun KtSymbolWithMembers.createInnerClasses(
?.getFlag(JvmAnalysisFlags.jvmDefaultMode) ?.getFlag(JvmAnalysisFlags.jvmDefaultMode)
?: JvmDefaultMode.DEFAULT ?: JvmDefaultMode.DEFAULT
if (containingClass is SymbolLightInterfaceClass && if (containingClass is SymbolLightClassForInterface &&
classOrObject?.hasInterfaceDefaultImpls == true && classOrObject?.hasInterfaceDefaultImpls == true &&
jvmDefaultMode != JvmDefaultMode.ALL_INCOMPATIBLE jvmDefaultMode != JvmDefaultMode.ALL_INCOMPATIBLE
) { ) {