From 618d6526a7ce5518fce427e9d770c060fc11d7e8 Mon Sep 17 00:00:00 2001 From: Jinseong Jeon Date: Mon, 5 Jun 2023 23:02:15 -0700 Subject: [PATCH] Rename KtLightClassForScript to reuse it for common interface between LCs --- ...ightClassForScript.kt => KtLightClassForScriptBase.kt} | 8 ++++---- .../kotlin/asJava/classes/ultraLightClassForScript.kt | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) rename analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/{KtLightClassForScript.kt => KtLightClassForScriptBase.kt} (93%) diff --git a/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForScript.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForScriptBase.kt similarity index 93% rename from analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForScript.kt rename to analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForScriptBase.kt index 60dda7baaae..931b5d86ebe 100644 --- a/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForScript.kt +++ b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForScriptBase.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.psi.KtScript import javax.swing.Icon -abstract class KtLightClassForScript(val script: KtScript) : KtLightClassBase(script.manager) { +abstract class KtLightClassForScriptBase(val script: KtScript) : KtLightClassBase(script.manager) { private val modifierList: PsiModifierList = LightModifierList( manager, KotlinLanguage.INSTANCE, @@ -92,7 +92,7 @@ abstract class KtLightClassForScript(val script: KtScript) : KtLightClassBase(sc override fun isEquivalentTo(another: PsiElement?): Boolean = equals(another) || - (another is KtLightClassForScript && fqName == another.fqName) + (another is KtLightClassForScriptBase && fqName == another.fqName) override fun getElementIcon(flags: Int): Icon? = throw UnsupportedOperationException("This should be done by KotlinIconProvider") @@ -138,7 +138,7 @@ abstract class KtLightClassForScript(val script: KtScript) : KtLightClassBase(sc return false } - val lightClass = other as? KtLightClassForScript ?: return false + val lightClass = other as? KtLightClassForScriptBase ?: return false if (this === other) return true if (script != lightClass.script) return false @@ -146,5 +146,5 @@ abstract class KtLightClassForScript(val script: KtScript) : KtLightClassBase(sc return true } - override fun toString() = "${KtLightClassForScript::class.java.simpleName}:${script.fqName}" + override fun toString() = "${KtLightClassForScriptBase::class.java.simpleName}:${script.fqName}" } diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightClassForScript.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightClassForScript.kt index f7e78ab58c5..5d8d68674ae 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightClassForScript.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightClassForScript.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.psi.KtScript class KtUltraLightClassForScript( script: KtScript, private val support: KtUltraLightSupport, -) : KtLightClassForScript(script) { +) : KtLightClassForScriptBase(script) { private val membersBuilder by lazyPub { UltraLightMembersCreator( containingClass = this, @@ -129,7 +129,7 @@ class KtUltraLightClassForScript( override fun getOwnFields(): List = _ownFields - override fun copy(): KtLightClassForScript = KtUltraLightClassForScript(script, support) + override fun copy(): KtUltraLightClassForScript = KtUltraLightClassForScript(script, support) override fun getOwnInnerClasses(): List { return script.declarations.filterIsInstance()