From 7def536751979b13a6e0502672c35f1a4648f948 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Wed, 21 Dec 2016 19:21:02 +0300 Subject: [PATCH] Project View: Fix presentation of Kotlin files and their members when @JvmName having the same name as the file itself --- ChangeLog.md | 2 ++ .../jetbrains/kotlin/idea/projectView/projectViewProviders.kt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/ChangeLog.md b/ChangeLog.md index 74194a10360..1c996de9f18 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -468,6 +468,8 @@ These artifacts include extensions for the types available in the latter JDKs, s ### IDE +- Project View: Fix presentation of Kotlin files and their members when @JvmName having the same name as the file itself + #### Intention actions, inspections and quickfixes ##### New features diff --git a/idea/src/org/jetbrains/kotlin/idea/projectView/projectViewProviders.kt b/idea/src/org/jetbrains/kotlin/idea/projectView/projectViewProviders.kt index 5f17a5ab179..0f1eb97abdc 100644 --- a/idea/src/org/jetbrains/kotlin/idea/projectView/projectViewProviders.kt +++ b/idea/src/org/jetbrains/kotlin/idea/projectView/projectViewProviders.kt @@ -26,6 +26,7 @@ import com.intellij.openapi.roots.ProjectRootManager import com.intellij.openapi.vfs.VirtualFile import com.intellij.psi.PsiElement import org.jetbrains.kotlin.asJava.classes.KtLightClass +import org.jetbrains.kotlin.asJava.classes.KtLightClassForFacade import org.jetbrains.kotlin.idea.KotlinIconProvider import org.jetbrains.kotlin.psi.KtClassBody import org.jetbrains.kotlin.psi.KtClassOrObject @@ -69,6 +70,7 @@ class KotlinExpandNodeProjectViewProvider : TreeStructureProvider, DumbAware { private fun Any.asKtFile(): KtFile? = when (this) { is KtFile -> this + is KtLightClassForFacade -> files.singleOrNull() is KtLightClass -> kotlinOrigin?.containingFile as? KtFile else -> null }