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

j2k: minor fixes in KtLightClassForAnonymousDeclaration

Browse Source
This commit is contained in:
Nikolay Krasko
2016-06-08 18:08:12 +03:00
parent 4679ae60ab
commit 688c742802
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForAnonymousDeclaration.kt
+7 -10
View File
@@ -17,18 +17,16 @@
package org.jetbrains.kotlin.asJava package org.jetbrains.kotlin.asJava
import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.project.Project
import com.intellij.psi.* import com.intellij.psi.*
import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.GlobalSearchScope
import com.intellij.reference.SoftReference import com.intellij.reference.SoftReference
import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.psi.KtClassOrObject
import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.DescriptorUtils
import org.jetbrains.kotlin.types.KotlinType
internal open class KtLightClassForAnonymousDeclaration(name: FqName, classOrObject: KtClassOrObject) : KtLightClassForExplicitDeclaration(name, classOrObject), PsiAnonymousClass { internal open class KtLightClassForAnonymousDeclaration(name: FqName,
classOrObject: KtClassOrObject) :
KtLightClassForExplicitDeclaration(name, classOrObject), PsiAnonymousClass {
private var cachedBaseType: SoftReference<PsiClassType>? = null private var cachedBaseType: SoftReference<PsiClassType>? = null
@@ -40,8 +38,7 @@ internal open class KtLightClassForAnonymousDeclaration(name: FqName, classOrObj
return delegate.containingClass return delegate.containingClass
} }
private // return java.lang.Object for recovery private val firstSupertypeFQName: String
val firstSupertypeFQName: String
get() { get() {
val descriptor = getDescriptor() ?: return CommonClassNames.JAVA_LANG_OBJECT val descriptor = getDescriptor() ?: return CommonClassNames.JAVA_LANG_OBJECT
@@ -54,6 +51,8 @@ internal open class KtLightClassForAnonymousDeclaration(name: FqName, classOrObj
if (superClassDescriptor == null) { if (superClassDescriptor == null) {
LOG.error("No declaration descriptor for supertype " + superType + " of " + getDescriptor()) LOG.error("No declaration descriptor for supertype " + superType + " of " + getDescriptor())
// return java.lang.Object for recovery
return CommonClassNames.JAVA_LANG_OBJECT return CommonClassNames.JAVA_LANG_OBJECT
} }
@@ -83,9 +82,7 @@ internal open class KtLightClassForAnonymousDeclaration(name: FqName, classOrObj
return type return type
} }
override fun getArgumentList(): PsiExpressionList? { override fun getArgumentList(): PsiExpressionList? = null
return null
}
override fun isInQualifiedNew(): Boolean { override fun isInQualifiedNew(): Boolean {
return false return false