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

rename "Jet" from names of IDE classes; consistently use Kt prefix for PSI elements and classes directly related to specific PSI elements

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-11-02 18:22:52 +01:00
parent fff404780c
commit 3bd7f87d2b
434 changed files with 1867 additions and 1924 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/light-classes/src/org/jetbrains/kotlin/asJava/FakeFileForLightClass.kt
+1 -1
View File
@@ -45,7 +45,7 @@ open class FakeFileForLightClass(
private val packageFqName: FqName,
virtualFile: VirtualFile,
psiManager: PsiManager,
private val lightClass: KotlinLightClass,
private val lightClass: KtLightClass,
private val stub: () -> PsiClassHolderFileStub<*>
) : ClsFileImpl(ClassFileViewProvider(psiManager, virtualFile)) {
override fun getPackageName() = packageFqName.asString()
compiler/light-classes/src/org/jetbrains/kotlin/asJava/FakeLightClassForFileOfPackage.java
+4 -4
View File
@@ -32,17 +32,17 @@ import org.jetbrains.kotlin.psi.KtFile;
/**
* This class serves as a workaround for usages of {@link JavaElementFinder#findClasses} which eventually only need names of files
* containing the class. When queried for a package class (e.g. test/TestPackage), {@code findClasses} along with a
* {@link KotlinLightClassForFacade} would also return multiple instances of this class for each file present in the package. The client
* {@link KtLightClassForFacade} would also return multiple instances of this class for each file present in the package. The client
* code can make use of every file in the package then, since {@code getContainingFile} of these instances will represent the whole package.
* <p/>
* See {@link LineBreakpoint#findClassCandidatesInSourceContent} for the primary usage this was introduced
*/
public class FakeLightClassForFileOfPackage extends AbstractLightClass implements KotlinLightClass, JetJavaMirrorMarker {
private final KotlinLightClassForFacade delegate;
public class FakeLightClassForFileOfPackage extends AbstractLightClass implements KtLightClass, JetJavaMirrorMarker {
private final KtLightClassForFacade delegate;
private final KtFile file;
public FakeLightClassForFileOfPackage(
@NotNull PsiManager manager, @NotNull KotlinLightClassForFacade delegate, @NotNull KtFile file
@NotNull PsiManager manager, @NotNull KtLightClassForFacade delegate, @NotNull KtFile file
) {
super(manager);
this.delegate = delegate;
compiler/light-classes/src/org/jetbrains/kotlin/asJava/JavaElementFinder.java
+2 -2
View File
@@ -189,7 +189,7 @@ public class JavaElementFinder extends PsiElementFinder implements KotlinFinderM
// allScope() because the contract says that the whole project
GlobalSearchScope allScope = GlobalSearchScope.allScope(project);
if (lightClassGenerationSupport.packageExists(fqName, allScope)) {
return new KotlinLightPackage(psiManager, fqName, allScope);
return new KtLightPackage(psiManager, fqName, allScope);
}
return null;
@@ -205,7 +205,7 @@ public class JavaElementFinder extends PsiElementFinder implements KotlinFinderM
Collection<PsiPackage> answer = Collections2.transform(subpackages, new Function<FqName, PsiPackage>() {
@Override
public PsiPackage apply(@Nullable FqName input) {
return new KotlinLightPackage(psiManager, input, scope);
return new KtLightPackage(psiManager, input, scope);
}
});
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClass.kt → compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClass.kt
+1 -1
View File
@@ -20,6 +20,6 @@ import com.intellij.psi.PsiClass;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.psi.KtClassOrObject
public interface KotlinLightClass : PsiClass, KotlinLightElement<KtClassOrObject, PsiClass> {
public interface KtLightClass : PsiClass, KtLightElement<KtClassOrObject, PsiClass> {
public fun getFqName(): FqName
}
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForAnonymousDeclaration.java → compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForAnonymousDeclaration.java
+3 -3
View File
@@ -32,12 +32,12 @@ import org.jetbrains.kotlin.types.KotlinType;
import java.util.Collection;
class KotlinLightClassForAnonymousDeclaration extends KotlinLightClassForExplicitDeclaration implements PsiAnonymousClass {
private static final Logger LOG = Logger.getInstance(KotlinLightClassForAnonymousDeclaration.class);
class KtLightClassForAnonymousDeclaration extends KtLightClassForExplicitDeclaration implements PsiAnonymousClass {
private static final Logger LOG = Logger.getInstance(KtLightClassForAnonymousDeclaration.class);
private SoftReference<PsiClassType> cachedBaseType = null;
KotlinLightClassForAnonymousDeclaration(@NotNull PsiManager manager, @NotNull FqName name, @NotNull KtClassOrObject classOrObject) {
KtLightClassForAnonymousDeclaration(@NotNull PsiManager manager, @NotNull FqName name, @NotNull KtClassOrObject classOrObject) {
super(manager, name, classOrObject);
}
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForEnumEntry.kt → compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForEnumEntry.kt
+2 -2
View File
@@ -22,11 +22,11 @@ import org.jetbrains.kotlin.psi.KtEnumEntry
import com.intellij.psi.PsiEnumConstantInitializer
import com.intellij.psi.PsiEnumConstant
internal class KotlinLightClassForEnumEntry(
internal class KtLightClassForEnumEntry(
psiManager: PsiManager,
fqName: FqName,
enumEntry: KtEnumEntry,
private val enumConstant: PsiEnumConstant
): KotlinLightClassForAnonymousDeclaration(psiManager, fqName, enumEntry), PsiEnumConstantInitializer {
): KtLightClassForAnonymousDeclaration(psiManager, fqName, enumEntry), PsiEnumConstantInitializer {
override fun getEnumConstant(): PsiEnumConstant = enumConstant
}
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.kt → compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForExplicitDeclaration.kt
+15 -15
View File
@@ -47,11 +47,11 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils
import org.jetbrains.kotlin.resolve.jvm.JvmClassName
import javax.swing.Icon
public open class KotlinLightClassForExplicitDeclaration(
public open class KtLightClassForExplicitDeclaration(
manager: PsiManager,
protected val classFqName: FqName, // FqName of (possibly inner) class
protected val classOrObject: KtClassOrObject)
: KotlinWrappingLightClass(manager), JetJavaMirrorMarker, StubBasedPsiElement<KotlinClassOrObjectStub<out KtClassOrObject>> {
: KtWrappingLightClass(manager), JetJavaMirrorMarker, StubBasedPsiElement<KotlinClassOrObjectStub<out KtClassOrObject>> {
private var delegate: PsiClass? = null
private fun getLocalClassParent(): PsiElement? {
@@ -64,8 +64,8 @@ public open class KotlinLightClassForExplicitDeclaration(
var createWrapper = forceMethodWrapping
// Use PsiClass wrapper instead of package light class to avoid names like "FooPackage" in Type Hierarchy and related views
if (containingClass is KotlinLightClassForFacade) {
containingClass = object : LightClass(containingClass as KotlinLightClassForFacade, KotlinLanguage.INSTANCE) {
if (containingClass is KtLightClassForFacade) {
containingClass = object : LightClass(containingClass as KtLightClassForFacade, KotlinLanguage.INSTANCE) {
override fun getName(): String? {
return currentFileName
}
@@ -138,7 +138,7 @@ public open class KotlinLightClassForExplicitDeclaration(
override fun getFqName(): FqName = classFqName
override fun copy(): PsiElement {
return KotlinLightClassForExplicitDeclaration(manager, classFqName, classOrObject.copy() as KtClassOrObject)
return KtLightClassForExplicitDeclaration(manager, classFqName, classOrObject.copy() as KtClassOrObject)
}
override fun getDelegate(): PsiClass {
@@ -216,7 +216,7 @@ public open class KotlinLightClassForExplicitDeclaration(
if (this === o) return true
if (o == null || javaClass != o.javaClass) return false
val aClass = o as KotlinLightClassForExplicitDeclaration
val aClass = o as KtLightClassForExplicitDeclaration
if (classFqName != aClass.classFqName) return false
@@ -245,9 +245,9 @@ public open class KotlinLightClassForExplicitDeclaration(
override fun getQualifiedName(): String = classFqName.asString()
private val _modifierList : PsiModifierList by lazy {
object : KotlinLightModifierList(this.manager, computeModifiers()) {
object : KtLightModifierList(this.manager, computeModifiers()) {
override fun getDelegate(): PsiModifierList {
return this@KotlinLightClassForExplicitDeclaration.getDelegate().modifierList!!
return this@KtLightClassForExplicitDeclaration.getDelegate().modifierList!!
}
}
}
@@ -333,7 +333,7 @@ public open class KotlinLightClassForExplicitDeclaration(
override fun isInheritor(baseClass: PsiClass, checkDeep: Boolean): Boolean {
val qualifiedName: String?
if (baseClass is KotlinLightClassForExplicitDeclaration) {
if (baseClass is KtLightClassForExplicitDeclaration) {
val baseDescriptor = baseClass.getDescriptor()
qualifiedName = if (baseDescriptor != null) DescriptorUtils.getFqName(baseDescriptor).asString() else null
}
@@ -353,10 +353,10 @@ public open class KotlinLightClassForExplicitDeclaration(
override fun toString(): String {
try {
return javaClass<KotlinLightClass>().simpleName + ":" + qualifiedName
return javaClass<KtLightClass>().simpleName + ":" + qualifiedName
}
catch (e: Throwable) {
return javaClass<KotlinLightClass>().simpleName + ":" + e.toString()
return javaClass<KtLightClass>().simpleName + ":" + e.toString()
}
}
@@ -390,7 +390,7 @@ public open class KotlinLightClassForExplicitDeclaration(
manager: PsiManager,
classOrObject: KtClassOrObject,
psiClass: PsiClass? = null
): KotlinLightClassForExplicitDeclaration? {
): KtLightClassForExplicitDeclaration? {
if (LightClassUtil.belongsToKotlinBuiltIns(classOrObject.getContainingJetFile())) {
return null
}
@@ -398,17 +398,17 @@ public open class KotlinLightClassForExplicitDeclaration(
val fqName = predictFqName(classOrObject) ?: return null
if (classOrObject is KtObjectDeclaration && classOrObject.isObjectLiteral()) {
return KotlinLightClassForAnonymousDeclaration(manager, fqName, classOrObject)
return KtLightClassForAnonymousDeclaration(manager, fqName, classOrObject)
}
if (classOrObject.hasInterfaceDefaultImpls) {
val implsFqName = fqName.defaultImplsChild()
if (implsFqName.asString() == psiClass?.qualifiedName) {
return KotlinLightClassForInterfaceDefaultImpls(manager, implsFqName, classOrObject)
return KtLightClassForInterfaceDefaultImpls(manager, implsFqName, classOrObject)
}
}
return KotlinLightClassForExplicitDeclaration(manager, fqName, classOrObject)
return KtLightClassForExplicitDeclaration(manager, fqName, classOrObject)
}
private fun predictFqName(classOrObject: KtClassOrObject): FqName? {
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForFacade.kt → compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForFacade.kt
+13 -13
View File
@@ -35,14 +35,14 @@ import org.jetbrains.kotlin.psi.KtClassOrObject
import org.jetbrains.kotlin.psi.KtFile
import javax.swing.Icon
public class KotlinLightClassForFacade private constructor(
public class KtLightClassForFacade private constructor(
manager: PsiManager,
private val facadeClassFqName: FqName,
private val searchScope: GlobalSearchScope,
private val lightClassDataCache: CachedValue<KotlinFacadeLightClassData>,
files: Collection<KtFile>,
private val deprecated: Boolean
) : KotlinWrappingLightClass(manager), JetJavaMirrorMarker {
) : KtWrappingLightClass(manager), JetJavaMirrorMarker {
private data class StubCacheKey(val fqName: FqName, val searchScope: GlobalSearchScope)
@@ -124,19 +124,19 @@ public class KotlinLightClassForFacade private constructor(
override fun getImplementsListTypes() = PsiClassType.EMPTY_ARRAY
// TODO: Find a way to return just Object
override fun getExtendsList() = super<KotlinWrappingLightClass>.getExtendsList()
override fun getExtendsList() = super<KtWrappingLightClass>.getExtendsList()
// TODO see getExtendsList()
override fun getExtendsListTypes() = super<KotlinWrappingLightClass>.getExtendsListTypes()
override fun getExtendsListTypes() = super<KtWrappingLightClass>.getExtendsListTypes()
// TODO see getExtendsList()
override fun getSuperClass(): PsiClass? = super<KotlinWrappingLightClass>.getSuperClass()
override fun getSuperClass(): PsiClass? = super<KtWrappingLightClass>.getSuperClass()
// TODO see getExtendsList()
override fun getSupers(): Array<PsiClass> = super<KotlinWrappingLightClass>.getSupers()
override fun getSupers(): Array<PsiClass> = super<KtWrappingLightClass>.getSupers()
// TODO see getExtendsList()
override fun getSuperTypes() = super<KotlinWrappingLightClass>.getSuperTypes()
override fun getSuperTypes() = super<KtWrappingLightClass>.getSuperTypes()
override fun getInterfaces() = PsiClass.EMPTY_ARRAY
@@ -158,7 +158,7 @@ public class KotlinLightClassForFacade private constructor(
override fun isValid() = files.all { it.isValid() }
override fun copy() = KotlinLightClassForFacade(getManager(), facadeClassFqName, searchScope, lightClassDataCache, files, deprecated)
override fun copy() = KtLightClassForFacade(getManager(), facadeClassFqName, searchScope, lightClassDataCache, files, deprecated)
override fun getDelegate(): PsiClass {
val psiClass = LightClassUtil.findClass(facadeClassFqName, lightClassDataCache.value.javaFileStub)
@@ -188,7 +188,7 @@ public class KotlinLightClassForFacade private constructor(
return false
}
val lightClass = other as KotlinLightClassForFacade
val lightClass = other as KtLightClassForFacade
if (this === other) return true
if (this.hashCode != lightClass.hashCode) return false
@@ -201,10 +201,10 @@ public class KotlinLightClassForFacade private constructor(
override fun toString(): String {
try {
return javaClass<KotlinLightClassForFacade>().getSimpleName() + ":" + getQualifiedName()
return javaClass<KtLightClassForFacade>().getSimpleName() + ":" + getQualifiedName()
}
catch (e: Throwable) {
return javaClass<KotlinLightClassForFacade>().getSimpleName() + ":" + e.toString()
return javaClass<KtLightClassForFacade>().getSimpleName() + ":" + e.toString()
}
}
@@ -214,7 +214,7 @@ public class KotlinLightClassForFacade private constructor(
facadeClassFqName: FqName,
searchScope: GlobalSearchScope,
files: Collection<KtFile>
): KotlinLightClassForFacade? {
): KtLightClassForFacade? {
if (files.any { LightClassUtil.belongsToKotlinBuiltIns(it) }) {
return null
}
@@ -222,7 +222,7 @@ public class KotlinLightClassForFacade private constructor(
assert(files.isNotEmpty()) { "No files for facade $facadeClassFqName" }
val lightClassDataCache = FacadeStubCache.getInstance(manager.project).get(facadeClassFqName, searchScope)
return KotlinLightClassForFacade(manager, facadeClassFqName, searchScope, lightClassDataCache, files, false)
return KtLightClassForFacade(manager, facadeClassFqName, searchScope, lightClassDataCache, files, false)
}
}
}
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForInterfaceDefaultImpls.kt → compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForInterfaceDefaultImpls.kt
+3 -3
View File
@@ -21,14 +21,14 @@ import com.intellij.util.IncorrectOperationException
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.psi.KtClassOrObject
public open class KotlinLightClassForInterfaceDefaultImpls(
public open class KtLightClassForInterfaceDefaultImpls(
manager: PsiManager,
classFqName: FqName,
classOrObject: KtClassOrObject)
: KotlinLightClassForExplicitDeclaration(manager, classFqName, classOrObject){
: KtLightClassForExplicitDeclaration(manager, classFqName, classOrObject){
override fun copy(): PsiElement {
return KotlinLightClassForInterfaceDefaultImpls(manager, classFqName, classOrObject.copy() as KtClassOrObject)
return KtLightClassForInterfaceDefaultImpls(manager, classFqName, classOrObject.copy() as KtClassOrObject)
}
override fun getTypeParameterList(): PsiTypeParameterList? = null
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightElement.kt → compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightElement.kt
+1 -1
View File
@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.psi.KtDeclaration
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiNamedElement
public interface KotlinLightElement<T : KtDeclaration, D : PsiElement> : PsiNamedElement {
public interface KtLightElement<T : KtDeclaration, D : PsiElement> : PsiNamedElement {
public fun getOrigin(): T?
public fun getDelegate(): D
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightField.kt → compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightField.kt
+14 -14
View File
@@ -26,14 +26,14 @@ import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.psi.KtDeclaration
import org.jetbrains.kotlin.psi.KtEnumEntry
public interface KotlinLightField : PsiField, KotlinLightElement<KtDeclaration, PsiField>
public interface KtLightField : PsiField, KtLightElement<KtDeclaration, PsiField>
// Copied from com.intellij.psi.impl.light.LightField
sealed class KotlinLightFieldImpl(
sealed class KtLightFieldImpl(
private val origin: KtDeclaration?,
private val delegate: PsiField,
private val containingClass: KotlinLightClass
) : LightElement(delegate.manager, KotlinLanguage.INSTANCE), KotlinLightField {
private val containingClass: KtLightClass
) : LightElement(delegate.manager, KotlinLanguage.INSTANCE), KtLightField {
@Throws(IncorrectOperationException::class)
override fun setInitializer(initializer: PsiExpression?) = throw IncorrectOperationException("Not supported")
@@ -84,7 +84,7 @@ sealed class KotlinLightFieldImpl(
override fun getNavigationElement() = origin ?: super.getNavigationElement()
override fun isEquivalentTo(another: PsiElement?): Boolean {
if (another is KotlinLightField && origin == another.getOrigin() && delegate == another.getDelegate()) {
if (another is KtLightField && origin == another.getOrigin() && delegate == another.getDelegate()) {
return true
}
return super.isEquivalentTo(another)
@@ -94,12 +94,12 @@ sealed class KotlinLightFieldImpl(
override fun copy() = Factory.create(origin?.copy() as? KtDeclaration, delegate, containingClass)
class KotlinLightEnumConstant(
class KtLightEnumConstant(
origin: KtEnumEntry?,
enumConstant: PsiEnumConstant,
containingClass: KotlinLightClass,
containingClass: KtLightClass,
private val initializingClass: PsiEnumConstantInitializer?
) : KotlinLightFieldImpl(origin, enumConstant, containingClass), PsiEnumConstant {
) : KtLightFieldImpl(origin, enumConstant, containingClass), PsiEnumConstant {
override fun getDelegate() = super.getDelegate() as PsiEnumConstant
// NOTE: we don't use "delegation by" because the compiler would generate method calls to ALL of PsiEnumConstant members,
@@ -115,22 +115,22 @@ sealed class KotlinLightFieldImpl(
override fun resolveMethodGenerics() = getDelegate().resolveMethodGenerics()
}
public class KotlinLightFieldForDeclaration(origin: KtDeclaration?, delegate: PsiField, containingClass: KotlinLightClass)
: KotlinLightFieldImpl(origin, delegate, containingClass)
public class KtLightFieldForDeclaration(origin: KtDeclaration?, delegate: PsiField, containingClass: KtLightClass)
: KtLightFieldImpl(origin, delegate, containingClass)
companion object Factory {
fun create(origin: KtDeclaration?, delegate: PsiField, containingClass: KotlinLightClass): KotlinLightField {
fun create(origin: KtDeclaration?, delegate: PsiField, containingClass: KtLightClass): KtLightField {
when (delegate) {
is PsiEnumConstant -> {
val kotlinEnumEntry = origin as? KtEnumEntry
val initializingClass = if (kotlinEnumEntry != null && kotlinEnumEntry.declarations.isNotEmpty()) {
val enumConstantFqName = FqName(containingClass.getFqName().asString() + "." + kotlinEnumEntry.name)
KotlinLightClassForEnumEntry(delegate.manager, enumConstantFqName, kotlinEnumEntry, delegate)
KtLightClassForEnumEntry(delegate.manager, enumConstantFqName, kotlinEnumEntry, delegate)
}
else null
return KotlinLightEnumConstant(kotlinEnumEntry, delegate, containingClass, initializingClass)
return KtLightEnumConstant(kotlinEnumEntry, delegate, containingClass, initializingClass)
}
else -> return KotlinLightFieldForDeclaration(origin, delegate, containingClass)
else -> return KtLightFieldForDeclaration(origin, delegate, containingClass)
}
}
}
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightMethod.kt → compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightMethod.kt
+21 -21
View File
@@ -25,14 +25,14 @@ import com.intellij.util.IncorrectOperationException
import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.psi.*
public interface KotlinLightMethod: PsiMethod, KotlinLightElement<KtDeclaration, PsiMethod>
public interface KtLightMethod : PsiMethod, KtLightElement<KtDeclaration, PsiMethod>
sealed class KotlinLightMethodImpl(
sealed class KtLightMethodImpl(
private val delegate: PsiMethod,
private val origin: KtDeclaration?,
containingClass: KotlinLightClass
): LightMethod(delegate.manager, delegate, containingClass), KotlinLightMethod {
override fun getContainingClass(): KotlinLightClass = super.getContainingClass() as KotlinLightClass
containingClass: KtLightClass
): LightMethod(delegate.manager, delegate, containingClass), KtLightMethod {
override fun getContainingClass(): KtLightClass = super.getContainingClass() as KtLightClass
private val paramsList: CachedValue<PsiParameterList> by lazy {
val cacheManager = CachedValuesManager.getManager(delegate.project)
@@ -40,7 +40,7 @@ sealed class KotlinLightMethodImpl(
val parameterBuilder = LightParameterListBuilder(manager, KotlinLanguage.INSTANCE, this)
for ((index, parameter) in delegate.parameterList.parameters.withIndex()) {
parameterBuilder.addParameter(KotlinLightParameter(parameter, index, this))
parameterBuilder.addParameter(KtLightParameter(parameter, index, this))
}
CachedValueProvider.Result.create(parameterBuilder, PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT)
@@ -57,7 +57,7 @@ sealed class KotlinLightMethodImpl(
delegate.typeParameterList
}
else {
LightClassUtil.buildLightTypeParameterList(this@KotlinLightMethodImpl, origin)
LightClassUtil.buildLightTypeParameterList(this@KtLightMethodImpl, origin)
}
CachedValueProvider.Result.create(list, PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT)
}, false)
@@ -123,7 +123,7 @@ sealed class KotlinLightMethodImpl(
}
override fun isEquivalentTo(another: PsiElement?): Boolean {
if (another is KotlinLightMethod && origin == another.getOrigin() && delegate == another.getDelegate()) {
if (another is KtLightMethod && origin == another.getOrigin() && delegate == another.getDelegate()) {
return true
}
@@ -131,7 +131,7 @@ sealed class KotlinLightMethodImpl(
}
override fun equals(other: Any?): Boolean =
other is KotlinLightMethod &&
other is KtLightMethod &&
name == other.name &&
origin == other.getOrigin() &&
containingClass == other.containingClass &&
@@ -141,39 +141,39 @@ sealed class KotlinLightMethodImpl(
override fun toString(): String = "${this.javaClass.simpleName}:$name"
private class KotlinLightMethodForDeclaration(
delegate: PsiMethod, origin: KtDeclaration?, containingClass: KotlinLightClass
) : KotlinLightMethodImpl(delegate, origin, containingClass)
private class KtLightMethodForDeclaration(
delegate: PsiMethod, origin: KtDeclaration?, containingClass: KtLightClass
) : KtLightMethodImpl(delegate, origin, containingClass)
private class KotlinLightAnnotationMethod(
private class KtLightAnnotationMethod(
delegate: PsiAnnotationMethod,
origin: KtDeclaration?,
containingClass: KotlinLightClass
) : KotlinLightMethodImpl(delegate, origin, containingClass), PsiAnnotationMethod {
containingClass: KtLightClass
) : KtLightMethodImpl(delegate, origin, containingClass), PsiAnnotationMethod {
override fun getDefaultValue() = getDelegate().defaultValue
override fun getDelegate() = super.getDelegate() as PsiAnnotationMethod
}
companion object Factory {
fun create(
delegate: PsiMethod, origin: KtDeclaration?, containingClass: KotlinLightClass
): KotlinLightMethodImpl {
delegate: PsiMethod, origin: KtDeclaration?, containingClass: KtLightClass
): KtLightMethodImpl {
return when (delegate) {
is PsiAnnotationMethod -> KotlinLightAnnotationMethod(delegate, origin, containingClass)
else -> KotlinLightMethodForDeclaration(delegate, origin, containingClass)
is PsiAnnotationMethod -> KtLightAnnotationMethod(delegate, origin, containingClass)
else -> KtLightMethodForDeclaration(delegate, origin, containingClass)
}
}
}
}
fun KotlinLightMethod.isTraitFakeOverride(): Boolean {
fun KtLightMethod.isTraitFakeOverride(): Boolean {
val methodOrigin = this.getOrigin()
if (!(methodOrigin is KtNamedFunction || methodOrigin is KtPropertyAccessor || methodOrigin is KtProperty)) {
return false
}
val parentOfMethodOrigin = PsiTreeUtil.getParentOfType(methodOrigin, KtClassOrObject::class.java)
val thisClassDeclaration = (this.containingClass as KotlinLightClass).getOrigin()
val thisClassDeclaration = (this.containingClass as KtLightClass).getOrigin()
// Method was generated from declaration in some other trait
return (parentOfMethodOrigin != null && thisClassDeclaration !== parentOfMethodOrigin && KtPsiUtil.isTrait(parentOfMethodOrigin))
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightModifierList.java → compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightModifierList.java
+2 -2
View File
@@ -25,8 +25,8 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.idea.KotlinLanguage;
public abstract class KotlinLightModifierList extends LightModifierList {
public KotlinLightModifierList(PsiManager psiManager, @NotNull String[] modifiers) {
public abstract class KtLightModifierList extends LightModifierList {
public KtLightModifierList(PsiManager psiManager, @NotNull String[] modifiers) {
super(psiManager, KotlinLanguage.INSTANCE, modifiers);
}
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightPackage.java → compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightPackage.java
+3 -3
View File
@@ -23,12 +23,12 @@ import com.intellij.psi.search.GlobalSearchScope;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.name.FqName;
public class KotlinLightPackage extends PsiPackageImpl {
public class KtLightPackage extends PsiPackageImpl {
private final FqName fqName;
private final GlobalSearchScope scope;
public KotlinLightPackage(PsiManager manager, FqName qualifiedName, GlobalSearchScope scope) {
public KtLightPackage(PsiManager manager, FqName qualifiedName, GlobalSearchScope scope) {
super(manager, qualifiedName.asString());
this.fqName = qualifiedName;
this.scope = scope;
@@ -37,7 +37,7 @@ public class KotlinLightPackage extends PsiPackageImpl {
@NotNull
@Override
public PsiElement copy() {
return new KotlinLightPackage(getManager(), fqName, scope);
return new KtLightPackage(getManager(), fqName, scope);
}
@Override
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightParameter.java → compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightParameter.java
+5 -5
View File
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.psi.psiUtil.JetPsiUtilKt;
import java.util.List;
public class KotlinLightParameter extends LightParameter implements KotlinLightElement<KtParameter, PsiParameter> {
public class KtLightParameter extends LightParameter implements KtLightElement<KtParameter, PsiParameter> {
private static String getName(PsiParameter delegate, int index) {
String name = delegate.getName();
return name != null ? name : "p" + index;
@@ -40,16 +40,16 @@ public class KotlinLightParameter extends LightParameter implements KotlinLightE
private final PsiModifierList modifierList;
private final PsiParameter delegate;
private final int index;
private final KotlinLightMethod method;
private final KtLightMethod method;
public KotlinLightParameter(final PsiParameter delegate, int index, KotlinLightMethod method) {
public KtLightParameter(final PsiParameter delegate, int index, KtLightMethod method) {
super(getName(delegate, index), delegate.getType(), method, KotlinLanguage.INSTANCE);
this.delegate = delegate;
this.index = index;
this.method = method;
this.modifierList = new KotlinLightModifierList(method.getManager(), ArrayUtil.EMPTY_STRING_ARRAY) {
this.modifierList = new KtLightModifierList(method.getManager(), ArrayUtil.EMPTY_STRING_ARRAY) {
@Override
public PsiAnnotationOwner getDelegate() {
return delegate.getModifierList();
@@ -132,7 +132,7 @@ public class KotlinLightParameter extends LightParameter implements KotlinLightE
return origin != null ? origin.getUseScope() : GlobalSearchScope.EMPTY_SCOPE;
}
public KotlinLightMethod getMethod() {
public KtLightMethod getMethod() {
return method;
}
}
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightTypeParameter.java → compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightTypeParameter.java
+7 -7
View File
@@ -26,13 +26,13 @@ import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.psi.KtTypeParameter;
import org.jetbrains.kotlin.psi.KtTypeParameterListOwner;
public class KotlinLightTypeParameter
extends AbstractLightClass implements PsiTypeParameter, KotlinLightElement<KtTypeParameter, PsiTypeParameter> {
public class KtLightTypeParameter
extends AbstractLightClass implements PsiTypeParameter, KtLightElement<KtTypeParameter, PsiTypeParameter> {
private final PsiTypeParameterListOwner owner;
private final int index;
private final String name;
protected KotlinLightTypeParameter(
protected KtLightTypeParameter(
@NotNull PsiTypeParameterListOwner owner,
int index,
@NotNull String name) {
@@ -59,15 +59,15 @@ public class KotlinLightTypeParameter
@NotNull
private PsiTypeParameterListOwner getOwnerDelegate() {
if (owner instanceof KotlinLightClass) return ((KotlinLightClass) owner).getDelegate();
if (owner instanceof KotlinLightMethod) return ((KotlinLightMethod) owner).getDelegate();
if (owner instanceof KtLightClass) return ((KtLightClass) owner).getDelegate();
if (owner instanceof KtLightMethod) return ((KtLightMethod) owner).getDelegate();
return owner;
}
@NotNull
@Override
public PsiElement copy() {
return new KotlinLightTypeParameter(owner, index, name);
return new KtLightTypeParameter(owner, index, name);
}
@Override
@@ -145,6 +145,6 @@ public class KotlinLightTypeParameter
@Override
public boolean equals(Object obj) {
if (obj == this) return true;
return obj instanceof KotlinLightTypeParameter && getOrigin().equals(((KotlinLightTypeParameter) obj).getOrigin());
return obj instanceof KtLightTypeParameter && getOrigin().equals(((KtLightTypeParameter) obj).getOrigin());
}
}
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java → compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtWrappingLightClass.java
+4 -6
View File
@@ -33,16 +33,14 @@ import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.psi.psiUtil.PsiUtilsKt;
import java.util.List;
public abstract class KotlinWrappingLightClass extends AbstractLightClass implements KotlinLightClass, PsiExtensibleClass {
public abstract class KtWrappingLightClass extends AbstractLightClass implements KtLightClass, PsiExtensibleClass {
private final ClassInnerStuffCache myInnersCache = new ClassInnerStuffCache(this);
protected KotlinWrappingLightClass(PsiManager manager) {
protected KtWrappingLightClass(PsiManager manager) {
super(manager, KotlinLanguage.INSTANCE);
}
@@ -122,7 +120,7 @@ public abstract class KotlinWrappingLightClass extends AbstractLightClass implem
@Override
public PsiField fun(PsiField field) {
KtDeclaration declaration = ClsWrapperStubPsiFactory.getOriginalDeclaration(field);
return KotlinLightFieldImpl.Factory.create(declaration, field, KotlinWrappingLightClass.this);
return KtLightFieldImpl.Factory.create(declaration, field, KtWrappingLightClass.this);
}
});
}
@@ -138,7 +136,7 @@ public abstract class KotlinWrappingLightClass extends AbstractLightClass implem
declaration = PsiTreeUtil.getParentOfType(declaration, KtProperty.class);
}
return KotlinLightMethodImpl.Factory.create(method, declaration, KotlinWrappingLightClass.this);
return KtLightMethodImpl.Factory.create(method, declaration, KtWrappingLightClass.this);
}
});
}
compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.kt
+5 -5
View File
@@ -144,7 +144,7 @@ public object LightClassUtil {
val outerPsiClass = getWrappingClass(companionObject, true)
if (outerPsiClass != null) {
for (fieldOfParent in outerPsiClass.fields) {
if ((fieldOfParent is KotlinLightElement<*, *>) && fieldOfParent.getOrigin() === companionObject) {
if ((fieldOfParent is KtLightElement<*, *>) && fieldOfParent.getOrigin() === companionObject) {
return fieldOfParent
}
}
@@ -165,7 +165,7 @@ public object LightClassUtil {
private fun getLightClassBackingField(declaration: KtDeclaration): PsiField? {
var psiClass: PsiClass = getWrappingClass(declaration, true) ?: return null
if (psiClass is KotlinLightClass) {
if (psiClass is KtLightClass) {
val origin = psiClass.getOrigin()
if (origin is KtObjectDeclaration && origin.isCompanion()) {
val containingClass = PsiTreeUtil.getParentOfType(origin, KtClass::class.java)
@@ -179,7 +179,7 @@ public object LightClassUtil {
}
for (field in psiClass.fields) {
if (field is KotlinLightField && field.getOrigin() === declaration) {
if (field is KtLightField && field.getOrigin() === declaration) {
return field
}
}
@@ -208,7 +208,7 @@ public object LightClassUtil {
val methods = SmartList<PsiMethod>()
for (method in psiClasses.flatMap { it.methods.asList() }) {
try {
if (method is KotlinLightMethod && method.getOrigin() === declaration) {
if (method is KtLightMethod && method.getOrigin() === declaration) {
methods.add(method)
if (!collectAll) {
return methods
@@ -332,7 +332,7 @@ public object LightClassUtil {
val jetTypeParameter = parameters.get(i)
val name = jetTypeParameter.name
val safeName = name ?: "__no_name__"
builder.addParameter(KotlinLightTypeParameter(owner, i, safeName))
builder.addParameter(KtLightTypeParameter(owner, i, safeName))
}
}
return builder
compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightParameterListBuilder.java
+3 -3
View File
@@ -27,10 +27,10 @@ import java.util.List;
// Copy of com.intellij.psi.impl.light.LightParameterListBuilder
public class LightParameterListBuilder extends LightElement implements PsiParameterList {
private final List<PsiParameter> myParameters = new ArrayList<PsiParameter>();
private final KotlinLightMethod parent;
private final KtLightMethod parent;
private PsiParameter[] myCachedParameters;
public LightParameterListBuilder(PsiManager manager, Language language, KotlinLightMethod parent) {
public LightParameterListBuilder(PsiManager manager, Language language, KtLightMethod parent) {
super(manager, language);
this.parent = parent;
}
@@ -41,7 +41,7 @@ public class LightParameterListBuilder extends LightElement implements PsiParame
}
@Override
public KotlinLightMethod getParent() {
public KtLightMethod getParent() {
return parent;
}
compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt
+2 -2
View File
@@ -33,13 +33,13 @@ import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm
public fun getJvmSignatureDiagnostics(element: PsiElement, otherDiagnostics: Diagnostics, moduleScope: GlobalSearchScope): Diagnostics? {
fun getDiagnosticsForFileFacade(file: KtFile): Diagnostics? {
val project = file.project
val cache = KotlinLightClassForFacade.FacadeStubCache.getInstance(project)
val cache = KtLightClassForFacade.FacadeStubCache.getInstance(project)
val facadeFqName = NoResolveFileClassesProvider.getFileClassInfo(file).facadeClassFqName
return cache[facadeFqName, moduleScope].getValue()?.extraDiagnostics
}
fun getDiagnosticsForClass(ktClassOrObject: KtClassOrObject): Diagnostics {
return KotlinLightClassForExplicitDeclaration.getLightClassData(ktClassOrObject).extraDiagnostics
return KtLightClassForExplicitDeclaration.getLightClassData(ktClassOrObject).extraDiagnostics
}
fun doGetDiagnostics(): Diagnostics? {
compiler/light-classes/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt
+2 -2
View File
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.utils.addToStdlib.singletonList
import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList
import java.util.*
public fun KtClassOrObject.toLightClass(): KotlinLightClass? = LightClassUtil.getPsiClass(this) as KotlinLightClass?
public fun KtClassOrObject.toLightClass(): KtLightClass? = LightClassUtil.getPsiClass(this) as KtLightClass?
public fun KtDeclaration.toLightElements(): List<PsiNamedElement> =
when (this) {
@@ -97,7 +97,7 @@ public fun KtTypeParameter.toPsiTypeParameters(): List<PsiTypeParameter> {
// Returns original declaration if given PsiElement is a Kotlin light element, and element itself otherwise
public val PsiElement.unwrapped: PsiElement?
get() = if (this is KotlinLightElement<*, *>) getOrigin() else this
get() = if (this is KtLightElement<*, *>) getOrigin() else this
public val PsiElement.namedUnwrappedElement: PsiNamedElement?
get() = unwrapped?.getNonStrictParentOfType<PsiNamedElement>()