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

Project View: Fix presentation of Kotlin files and their members when @JvmName having the same name as the file itself

Browse Source
This commit is contained in:
Alexey Sedunov
2016-12-21 19:21:02 +03:00
parent 612dffb893
commit 7def536751
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog.md
+2
View File
@@ -468,6 +468,8 @@ These artifacts include extensions for the types available in the latter JDKs, s
### IDE ### 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 #### Intention actions, inspections and quickfixes
##### New features ##### New features
idea/src/org/jetbrains/kotlin/idea/projectView/projectViewProviders.kt
+2
View File
@@ -26,6 +26,7 @@ import com.intellij.openapi.roots.ProjectRootManager
import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFile
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.asJava.classes.KtLightClass import org.jetbrains.kotlin.asJava.classes.KtLightClass
import org.jetbrains.kotlin.asJava.classes.KtLightClassForFacade
import org.jetbrains.kotlin.idea.KotlinIconProvider import org.jetbrains.kotlin.idea.KotlinIconProvider
import org.jetbrains.kotlin.psi.KtClassBody import org.jetbrains.kotlin.psi.KtClassBody
import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.psi.KtClassOrObject
@@ -69,6 +70,7 @@ class KotlinExpandNodeProjectViewProvider : TreeStructureProvider, DumbAware {
private fun Any.asKtFile(): KtFile? = when (this) { private fun Any.asKtFile(): KtFile? = when (this) {
is KtFile -> this is KtFile -> this
is KtLightClassForFacade -> files.singleOrNull()
is KtLightClass -> kotlinOrigin?.containingFile as? KtFile is KtLightClass -> kotlinOrigin?.containingFile as? KtFile
else -> null else -> null
} }