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

Search Everywhere: Recover original behavior for non-functions

Browse Source 
#KT-25189 Fixed
This commit is contained in:
Alexey Sedunov
2018-07-02 20:15:08 +03:00
parent e4af8dc7d8
commit 03ed4e39e3
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/goto/SearchEverywherePsiRenderer.kt
+3 -2
View File
@@ -30,6 +30,7 @@ import com.intellij.ui.ColoredListCellRenderer
import com.intellij.ui.JBColor import com.intellij.ui.JBColor
import com.intellij.ui.SimpleTextAttributes import com.intellij.ui.SimpleTextAttributes
import com.intellij.util.ui.FilePathSplittingPolicy import com.intellij.util.ui.FilePathSplittingPolicy
import com.intellij.ide.util.DefaultPsiElementCellRenderer
import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers
import org.jetbrains.kotlin.psi.KtNamedFunction import org.jetbrains.kotlin.psi.KtNamedFunction
@@ -43,7 +44,7 @@ import javax.swing.JList
// Mostly copied from com.intellij.ide.actions.SearchEverywherePsiRenderer // Mostly copied from com.intellij.ide.actions.SearchEverywherePsiRenderer
// TODO: Drop copied code when SearchEverywherePsiRenderer becomes public // TODO: Drop copied code when SearchEverywherePsiRenderer becomes public
internal class KotlinSearchEverywherePsiRenderer(private val myList: JList<*>) : PsiElementListCellRenderer<PsiElement>() { internal class KotlinSearchEverywherePsiRenderer(private val myList: JList<*>) : DefaultPsiElementCellRenderer() {
companion object { companion object {
private val RENDERER = IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_NO_ANNOTATIONS.withOptions { private val RENDERER = IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_NO_ANNOTATIONS.withOptions {
parameterNameRenderingPolicy = ParameterNameRenderingPolicy.NONE parameterNameRenderingPolicy = ParameterNameRenderingPolicy.NONE
@@ -71,7 +72,7 @@ internal class KotlinSearchEverywherePsiRenderer(private val myList: JList<*>) :
} }
override fun getElementText(element: PsiElement?): String { override fun getElementText(element: PsiElement?): String {
if (element !is KtNamedFunction) return "" if (element !is KtNamedFunction) return super.getElementText(element)
val descriptor = element.resolveToDescriptorIfAny() ?: return "" val descriptor = element.resolveToDescriptorIfAny() ?: return ""
return buildString { return buildString {
descriptor.extensionReceiverParameter?.let { append(RENDERER.renderType(it.type)).append('.') } descriptor.extensionReceiverParameter?.let { append(RENDERER.renderType(it.type)).append('.') }