From ed43dc953028d745c4f298dcf44290bacf723378 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Sat, 26 Nov 2022 17:15:55 +0100 Subject: [PATCH] [SLC] rename SymbolLightInterfaceClass to SymbolLightClassForInterface ^KT-54051 --- ...ghtInterfaceClass.kt => SymbolLightClassForInterface.kt} | 6 +++--- .../classes/SymbolLightClassForInterfaceDefaultImpls.kt | 4 ++-- .../light/classes/symbol/classes/symbolLightClassUtils.kt | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) rename analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/{SymbolLightInterfaceClass.kt => SymbolLightClassForInterface.kt} (91%) diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightInterfaceClass.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForInterface.kt similarity index 91% rename from analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightInterfaceClass.kt rename to analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForInterface.kt index 2ce1ca58965..3503c560959 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightInterfaceClass.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForInterface.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.asJava.elements.KtLightMethod import org.jetbrains.kotlin.psi.KtClass import org.jetbrains.kotlin.psi.KtClassOrObject -internal open class SymbolLightInterfaceClass : SymbolLightClassForInterfaceOrAnnotationClass { +internal open class SymbolLightClassForInterface : SymbolLightClassForInterfaceOrAnnotationClass { constructor( ktAnalysisSession: KtAnalysisSession, ktModule: KtModule, @@ -67,8 +67,8 @@ internal open class SymbolLightInterfaceClass : SymbolLightClassForInterfaceOrAn override fun getOwnMethods(): List = _ownMethods - override fun copy(): SymbolLightInterfaceClass = - SymbolLightInterfaceClass(classOrObjectDeclaration, classOrObjectSymbolPointer, ktModule, manager) + override fun copy(): SymbolLightClassForInterface = + SymbolLightClassForInterface(classOrObjectDeclaration, classOrObjectSymbolPointer, ktModule, manager) private val _extendsList: PsiReferenceList by lazyPub { withClassOrObjectSymbol { classOrObjectSymbol -> diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForInterfaceDefaultImpls.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForInterfaceDefaultImpls.kt index 07f6b218407..81bc0331d2e 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForInterfaceDefaultImpls.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForInterfaceDefaultImpls.kt @@ -10,8 +10,8 @@ import com.intellij.util.IncorrectOperationException import org.jetbrains.kotlin.light.classes.symbol.modifierLists.SymbolLightClassModifierList import org.jetbrains.kotlin.load.java.JvmAbi -internal class SymbolLightClassForInterfaceDefaultImpls(private val containingClass: SymbolLightInterfaceClass) : - SymbolLightInterfaceClass( +internal class SymbolLightClassForInterfaceDefaultImpls(private val containingClass: SymbolLightClassForInterface) : + SymbolLightClassForInterface( containingClass.classOrObjectDeclaration, containingClass.classOrObjectSymbolPointer, containingClass.ktModule, 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 3c88a08a4bc..fb5b0364497 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 @@ -57,7 +57,7 @@ internal fun createSymbolLightClassNoCache(classOrObject: KtClassOrObject, ktMod internal fun createLightClassNoCache(ktClassOrObject: KtClassOrObject, ktModule: KtModule): SymbolLightClassBase = when { ktClassOrObject.hasModifier(INLINE_KEYWORD) -> SymbolLightClassForInlineClass(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) } @@ -67,7 +67,7 @@ internal fun createLightClassNoCache( ktModule: KtModule, manager: PsiManager, ): SymbolLightClassBase = when (ktClassOrObjectSymbol.classKind) { - KtClassKind.INTERFACE -> SymbolLightInterfaceClass( + KtClassKind.INTERFACE -> SymbolLightClassForInterface( ktAnalysisSession = this@ktAnalysisSession, ktModule = ktModule, classOrObjectSymbol = ktClassOrObjectSymbol, @@ -463,7 +463,7 @@ internal fun KtSymbolWithMembers.createInnerClasses( ?.getFlag(JvmAnalysisFlags.jvmDefaultMode) ?: JvmDefaultMode.DEFAULT - if (containingClass is SymbolLightInterfaceClass && + if (containingClass is SymbolLightClassForInterface && classOrObject?.hasInterfaceDefaultImpls == true && jvmDefaultMode != JvmDefaultMode.ALL_INCOMPATIBLE ) {