From 03ed4e39e3365c746f2e2fbe0c5f64cafcb58708 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Mon, 2 Jul 2018 20:15:08 +0300 Subject: [PATCH] Search Everywhere: Recover original behavior for non-functions #KT-25189 Fixed --- .../kotlin/idea/goto/SearchEverywherePsiRenderer.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/goto/SearchEverywherePsiRenderer.kt b/idea/src/org/jetbrains/kotlin/idea/goto/SearchEverywherePsiRenderer.kt index 812f2643c94..cb7d86bba81 100644 --- a/idea/src/org/jetbrains/kotlin/idea/goto/SearchEverywherePsiRenderer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/goto/SearchEverywherePsiRenderer.kt @@ -30,6 +30,7 @@ import com.intellij.ui.ColoredListCellRenderer import com.intellij.ui.JBColor import com.intellij.ui.SimpleTextAttributes 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.util.IdeDescriptorRenderers import org.jetbrains.kotlin.psi.KtNamedFunction @@ -43,7 +44,7 @@ import javax.swing.JList // Mostly copied from com.intellij.ide.actions.SearchEverywherePsiRenderer // TODO: Drop copied code when SearchEverywherePsiRenderer becomes public -internal class KotlinSearchEverywherePsiRenderer(private val myList: JList<*>) : PsiElementListCellRenderer() { +internal class KotlinSearchEverywherePsiRenderer(private val myList: JList<*>) : DefaultPsiElementCellRenderer() { companion object { private val RENDERER = IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_NO_ANNOTATIONS.withOptions { parameterNameRenderingPolicy = ParameterNameRenderingPolicy.NONE @@ -71,7 +72,7 @@ internal class KotlinSearchEverywherePsiRenderer(private val myList: JList<*>) : } override fun getElementText(element: PsiElement?): String { - if (element !is KtNamedFunction) return "" + if (element !is KtNamedFunction) return super.getElementText(element) val descriptor = element.resolveToDescriptorIfAny() ?: return "" return buildString { descriptor.extensionReceiverParameter?.let { append(RENDERER.renderType(it.type)).append('.') }