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

Refactor: rename KtLightClassForExplicitDeclaration -> KtLightClassForSourceDeclaration

Browse Source
This commit is contained in:
Pavel V. Talanov
2016-07-26 15:14:26 +03:00
parent b686b37cbf
commit 999c8e7486
16 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForAnonymousDeclaration.kt
+2 -2
View File
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils
internal open class KtLightClassForAnonymousDeclaration(fqNameFunction: ((KtClassOrObject) -> FqName),
classOrObject: KtClassOrObject) :
KtLightClassForExplicitDeclaration(fqNameFunction, classOrObject), PsiAnonymousClass {
KtLightClassForSourceDeclaration(fqNameFunction, classOrObject), PsiAnonymousClass {
private var cachedBaseType: SoftReference<PsiClassType>? = null
@@ -101,7 +101,7 @@ internal open class KtLightClassForAnonymousDeclaration(fqNameFunction: ((KtClas
}
override fun isInheritor(baseClass: PsiClass, checkDeep: Boolean): Boolean {
if (baseClass is KtLightClassForExplicitDeclaration) {
if (baseClass is KtLightClassForSourceDeclaration) {
return super.isInheritor(baseClass, checkDeep)
}
compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForInterfaceDefaultImpls.kt
+2 -2
View File
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.psi.KtClassOrObject
open class KtLightClassForInterfaceDefaultImpls(
classFqName: FqName,
classOrObject: KtClassOrObject)
: KtLightClassForExplicitDeclaration({ classFqName }, classOrObject){
: KtLightClassForSourceDeclaration({ classFqName }, classOrObject){
override fun copy(): PsiElement {
return KtLightClassForInterfaceDefaultImpls(classFqName, classOrObject.copy() as KtClassOrObject)
@@ -47,7 +47,7 @@ open class KtLightClassForInterfaceDefaultImpls(
throw IncorrectOperationException("Impossible to rename DefaultImpls")
}
override fun getContainingClass() = KtLightClassForExplicitDeclaration.create(classOrObject)
override fun getContainingClass() = KtLightClassForSourceDeclaration.create(classOrObject)
override fun getOwnInnerClasses() = emptyList<PsiClass>()
}
compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForExplicitDeclaration.kt → compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt
+9 -9
View File
@@ -56,7 +56,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns
import java.util.*
import javax.swing.Icon
open class KtLightClassForExplicitDeclaration(
open class KtLightClassForSourceDeclaration(
private val classFqNameFunction: ((KtClassOrObject) -> FqName),
protected val classOrObject: KtClassOrObject)
: KtWrappingLightClass(classOrObject.manager), KtJavaMirrorMarker, StubBasedPsiElement<KotlinClassOrObjectStub<out KtClassOrObject>> {
@@ -160,7 +160,7 @@ open class KtLightClassForExplicitDeclaration(
override fun getFqName(): FqName = classFqName
override fun copy(): PsiElement {
return KtLightClassForExplicitDeclaration({ classFqName }, classOrObject.copy() as KtClassOrObject)
return KtLightClassForSourceDeclaration({ classFqName }, classOrObject.copy() as KtClassOrObject)
}
override val clsDelegate: PsiClass by lazy(LazyThreadSafetyMode.PUBLICATION) {
@@ -240,7 +240,7 @@ open class KtLightClassForExplicitDeclaration(
if (this === other) return true
if (other == null || javaClass != other.javaClass) return false
val aClass = other as KtLightClassForExplicitDeclaration
val aClass = other as KtLightClassForSourceDeclaration
if (classFqName != aClass.classFqName) return false
@@ -276,9 +276,9 @@ open class KtLightClassForExplicitDeclaration(
override fun getQualifiedName(): String? = classFqName.asString()
private val _modifierList : PsiModifierList by lazy(LazyThreadSafetyMode.PUBLICATION) {
object : KtLightModifierListWithExplicitModifiers(this@KtLightClassForExplicitDeclaration, computeModifiers()) {
object : KtLightModifierListWithExplicitModifiers(this@KtLightClassForSourceDeclaration, computeModifiers()) {
override val delegate: PsiAnnotationOwner
get() = this@KtLightClassForExplicitDeclaration.delegate.modifierList!!
get() = this@KtLightClassForSourceDeclaration.delegate.modifierList!!
}
}
@@ -376,7 +376,7 @@ open class KtLightClassForExplicitDeclaration(
override fun isInheritor(baseClass: PsiClass, checkDeep: Boolean): Boolean {
val qualifiedName: String?
if (baseClass is KtLightClassForExplicitDeclaration) {
if (baseClass is KtLightClassForSourceDeclaration) {
val baseDescriptor = baseClass.getDescriptor()
qualifiedName = if (baseDescriptor != null) DescriptorUtils.getFqName(baseDescriptor).asString() else null
}
@@ -427,7 +427,7 @@ open class KtLightClassForExplicitDeclaration(
FINAL_KEYWORD to PsiModifier.FINAL)
fun create(classOrObject: KtClassOrObject): KtLightClassForExplicitDeclaration? {
fun create(classOrObject: KtClassOrObject): KtLightClassForSourceDeclaration? {
if (classOrObject is KtObjectDeclaration && classOrObject.isObjectLiteral()) {
if (classOrObject.containingFile.virtualFile == null) {
return null
@@ -443,7 +443,7 @@ open class KtLightClassForExplicitDeclaration(
}
val fqName = predictFqName(classOrObject) ?: return null
return KtLightClassForExplicitDeclaration({ fqName }, classOrObject)
return KtLightClassForSourceDeclaration({ fqName }, classOrObject)
}
private fun isEnumEntryWithoutBody(classOrObject: KtClassOrObject): Boolean {
@@ -520,6 +520,6 @@ open class KtLightClassForExplicitDeclaration(
return false
}
private val LOG = Logger.getInstance(KtLightClassForExplicitDeclaration::class.java)
private val LOG = Logger.getInstance(KtLightClassForSourceDeclaration::class.java)
}
}
compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt
+2 -2
View File
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.asJava
import com.intellij.psi.PsiElement
import com.intellij.psi.search.GlobalSearchScope
import org.jetbrains.kotlin.asJava.builder.OutermostKotlinClassLightClassData
import org.jetbrains.kotlin.asJava.classes.KtLightClassForExplicitDeclaration
import org.jetbrains.kotlin.asJava.classes.KtLightClassForSourceDeclaration
import org.jetbrains.kotlin.asJava.classes.KtLightClassForFacade
import org.jetbrains.kotlin.diagnostics.Diagnostic
import org.jetbrains.kotlin.diagnostics.DiagnosticFactory
@@ -42,7 +42,7 @@ fun getJvmSignatureDiagnostics(element: PsiElement, otherDiagnostics: Diagnostic
}
fun getDiagnosticsForClass(ktClassOrObject: KtClassOrObject): Diagnostics {
return (KtLightClassForExplicitDeclaration.getLightClassData(ktClassOrObject) as? OutermostKotlinClassLightClassData)?.extraDiagnostics ?: Diagnostics.EMPTY
return (KtLightClassForSourceDeclaration.getLightClassData(ktClassOrObject) as? OutermostKotlinClassLightClassData)?.extraDiagnostics ?: Diagnostics.EMPTY
}
fun doGetDiagnostics(): Diagnostics? {
compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/FakeFileForLightClass.kt
+4 -4
View File
@@ -23,7 +23,7 @@ import com.intellij.psi.PsiElementVisitor
import com.intellij.psi.impl.compiled.ClsFileImpl
import com.intellij.psi.stubs.PsiClassHolderFileStub
import org.jetbrains.kotlin.asJava.classes.KtLightClass
import org.jetbrains.kotlin.asJava.classes.KtLightClassForExplicitDeclaration
import org.jetbrains.kotlin.asJava.classes.KtLightClassForSourceDeclaration
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.psi.KtFile
@@ -51,7 +51,7 @@ open class FakeFileForLightClass(
override fun hashCode(): Int {
val thisClass = lightClass()
if (thisClass is KtLightClassForExplicitDeclaration) return ktFile.hashCode()
if (thisClass is KtLightClassForSourceDeclaration) return ktFile.hashCode()
return thisClass.hashCode()
}
@@ -61,8 +61,8 @@ open class FakeFileForLightClass(
val thisClass = lightClass()
val anotherClass = other.lightClass()
if (thisClass is KtLightClassForExplicitDeclaration) {
return anotherClass is KtLightClassForExplicitDeclaration && ktFile == other.ktFile
if (thisClass is KtLightClassForSourceDeclaration) {
return anotherClass is KtLightClassForSourceDeclaration && ktFile == other.ktFile
}
return thisClass == anotherClass