Drop KtLightClass#getFqName() and some usages of classFqName in KtLightClassForDecompiledDeclaration

This commit is contained in:
Pavel V. Talanov
2016-07-26 16:37:29 +03:00
parent 1fda24fbbf
commit 5a1a1fc03a
10 changed files with 24 additions and 28 deletions
@@ -32,7 +32,7 @@ class KtLightClassForDecompiledDeclaration(
override val kotlinOrigin: KtClassOrObject?,
private val file: KtClsFile
) : KtLightClassBase(clsDelegate.manager) {
private val fqName = kotlinOrigin?.fqName ?: FqName(clsDelegate.qualifiedName)
val fqName = kotlinOrigin?.fqName ?: FqName(clsDelegate.qualifiedName)
override fun copy() = this
@@ -54,15 +54,13 @@ class KtLightClassForDecompiledDeclaration(
override fun getNavigationElement() = kotlinOrigin?.navigationElement ?: file
override fun getFqName() = fqName
override fun getParent() = clsDelegate.parent
override fun equals(other: Any?): Boolean =
other is KtLightClassForDecompiledDeclaration &&
getFqName() == other.getFqName()
fqName == other.fqName
override fun hashCode(): Int =
getFqName().hashCode()
fqName.hashCode()
}
@@ -19,11 +19,15 @@ package org.jetbrains.kotlin.idea.presentation
import com.intellij.ide.util.PsiElementListCellRenderer
import com.intellij.psi.presentation.java.ClassPresentationUtil
import org.jetbrains.kotlin.asJava.classes.KtLightClass
import org.jetbrains.kotlin.name.FqName
class KtLightClassListCellRenderer : PsiElementListCellRenderer<KtLightClass>() {
override fun getElementText(element: KtLightClass) = ClassPresentationUtil.getNameForClass(element, false)
override fun getContainerText(element: KtLightClass, name: String) = "(" + element.getFqName().parent() + ")"
// TODO: correct text for local, anonymous, enum entries ... etc
override fun getContainerText(element: KtLightClass, name: String) = element.qualifiedName?.let { qName ->
"(" + FqName(qName).parent().asString() + ")"
} ?: ""
override fun getIconFlags() = 0
}