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

Refactor: rename KtWrappingLightClass -> KtLightClassBase

Browse Source
This commit is contained in:
Pavel V. Talanov
2016-07-26 15:15:24 +03:00
parent 999c8e7486
commit 252235787d
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtWrappingLightClass.java → compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassBase.java
+4 -4
View File
@@ -44,10 +44,10 @@ import org.jetbrains.kotlin.psi.KtPropertyAccessor;
import java.util.List;
public abstract class KtWrappingLightClass extends AbstractLightClass implements KtLightClass, PsiExtensibleClass {
public abstract class KtLightClassBase extends AbstractLightClass implements KtLightClass, PsiExtensibleClass {
private final ClassInnerStuffCache myInnersCache = new ClassInnerStuffCache(this);
protected KtWrappingLightClass(PsiManager manager) {
protected KtLightClassBase(PsiManager manager) {
super(manager, KotlinLanguage.INSTANCE);
}
@@ -125,7 +125,7 @@ public abstract class KtWrappingLightClass extends AbstractLightClass implements
@Override
public PsiField fun(PsiField field) {
LightMemberOrigin origin = ClsWrapperStubPsiFactory.getMemberOrigin(field);
return KtLightFieldImpl.Factory.create(origin, field, KtWrappingLightClass.this);
return KtLightFieldImpl.Factory.create(origin, field, KtLightClassBase.this);
}
});
}
@@ -143,7 +143,7 @@ public abstract class KtWrappingLightClass extends AbstractLightClass implements
origin = origin.copy(PsiTreeUtil.getParentOfType(originalElement, KtProperty.class), origin.getOriginKind());
}
return KtLightMethodImpl.Factory.create(method, origin, KtWrappingLightClass.this);
return KtLightMethodImpl.Factory.create(method, origin, KtLightClassBase.this);
}
});
}
compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForFacade.kt
+1 -1
View File
@@ -52,7 +52,7 @@ class KtLightClassForFacade private constructor(
private val facadeClassFqName: FqName,
private val lightClassDataCache: CachedValue<KotlinFacadeLightClassData>,
files: Collection<KtFile>
) : KtWrappingLightClass(manager), KtJavaMirrorMarker {
) : KtLightClassBase(manager), KtJavaMirrorMarker {
private data class StubCacheKey(val fqName: FqName, val searchScope: GlobalSearchScope)
compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt
+1 -1
View File
@@ -59,7 +59,7 @@ import javax.swing.Icon
open class KtLightClassForSourceDeclaration(
private val classFqNameFunction: ((KtClassOrObject) -> FqName),
protected val classOrObject: KtClassOrObject)
: KtWrappingLightClass(classOrObject.manager), KtJavaMirrorMarker, StubBasedPsiElement<KotlinClassOrObjectStub<out KtClassOrObject>> {
: KtLightClassBase(classOrObject.manager), KtJavaMirrorMarker, StubBasedPsiElement<KotlinClassOrObjectStub<out KtClassOrObject>> {
private val lightIdentifier = KtLightIdentifier(this, classOrObject)
protected val classFqName : FqName by lazy(LazyThreadSafetyMode.PUBLICATION) {
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KtLightClassForDecompiledDeclaration.kt
+2 -2
View File
@@ -20,7 +20,7 @@ import com.intellij.psi.PsiClass
import com.intellij.psi.PsiField
import com.intellij.psi.PsiMethod
import com.intellij.psi.impl.compiled.ClsClassImpl
import org.jetbrains.kotlin.asJava.classes.KtWrappingLightClass
import org.jetbrains.kotlin.asJava.classes.KtLightClassBase
import org.jetbrains.kotlin.asJava.elements.KtLightFieldImpl
import org.jetbrains.kotlin.asJava.elements.KtLightMethodImpl
import org.jetbrains.kotlin.idea.decompiler.classFile.KtClsFile
@@ -31,7 +31,7 @@ class KtLightClassForDecompiledDeclaration(
override val clsDelegate: ClsClassImpl,
override val kotlinOrigin: KtClassOrObject?,
private val file: KtClsFile
) : KtWrappingLightClass(clsDelegate.manager) {
) : KtLightClassBase(clsDelegate.manager) {
private val fqName = kotlinOrigin?.fqName ?: FqName(clsDelegate.qualifiedName)
override fun copy() = this