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

Don't use light classes for navigation element (KT-10215)

Browse Source 
Place KotlinNavBarModelExtension before Java extension because it
substitutes non-java elements to files.

 #KT-10215 Fixed
This commit is contained in:
Nikolay Krasko
2019-05-17 18:13:38 +03:00
parent 0a4d21c51f
commit ef70e9db19
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/resources/META-INF/plugin-common.xml
+1 -1
View File
@@ -3426,6 +3426,6 @@
<stripTrailingSpacesFilterFactory implementation="org.jetbrains.kotlin.idea.editor.KotlinStripTrailingSpacesFilterFactory"/> <stripTrailingSpacesFilterFactory implementation="org.jetbrains.kotlin.idea.editor.KotlinStripTrailingSpacesFilterFactory"/>
<navbar implementation="org.jetbrains.kotlin.idea.navigationToolbar.KotlinNavBarModelExtension"/> <navbar implementation="org.jetbrains.kotlin.idea.navigationToolbar.KotlinNavBarModelExtension" order="first"/>
</extensions> </extensions>
</idea-plugin> </idea-plugin>
idea/src/org/jetbrains/kotlin/idea/navigationToolbar/KotlinNavBarModelExtension.kt
+7 -3
View File
@@ -9,16 +9,20 @@ import com.intellij.ide.navigationToolbar.AbstractNavBarModelExtension
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.asJava.toLightClass import org.jetbrains.kotlin.asJava.toLightClass
import org.jetbrains.kotlin.idea.KotlinIconProvider import org.jetbrains.kotlin.idea.KotlinIconProvider
import org.jetbrains.kotlin.psi.KtClassOrObject
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
class KotlinNavBarModelExtension : AbstractNavBarModelExtension() { class KotlinNavBarModelExtension : AbstractNavBarModelExtension() {
override fun getPresentableText(`object`: Any?): String? { override fun getPresentableText(item: Any?): String? {
return null return when (item) {
is KtClassOrObject -> item.name ?: "unknown"
else -> null
}
} }
override fun adjustElement(psiElement: PsiElement?): PsiElement? { override fun adjustElement(psiElement: PsiElement?): PsiElement? {
val containingFile = psiElement?.containingFile as? KtFile ?: return psiElement val containingFile = psiElement?.containingFile as? KtFile ?: return psiElement
if (containingFile.isScript()) return psiElement if (containingFile.isScript()) return psiElement
return KotlinIconProvider.getSingleClass(containingFile)?.toLightClass() ?: psiElement return KotlinIconProvider.getSingleClass(containingFile) ?: psiElement
} }
} }