diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationOnlyHandler2.kt b/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationOnlyHandler2.kt index 2f8ab1d36815..b223432bb24a 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationOnlyHandler2.kt +++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationOnlyHandler2.kt @@ -41,7 +41,7 @@ object GotoDeclarationOnlyHandler2 : CodeInsightActionHandler { notifyCantGoAnywhere(project, editor, file) } else { - chooseTarget(project, editor, CodeInsightBundle.message("declaration.navigation.title"), targets.toList()) { + chooseTarget(editor, CodeInsightBundle.message("declaration.navigation.title"), targets.toList()) { gotoTarget(project, editor, file, it) } } diff --git a/platform/lang-impl/src/com/intellij/ide/ui/TargetPresentationMainRenderer.kt b/platform/lang-impl/src/com/intellij/ide/ui/TargetPresentationMainRenderer.kt index dce9ebe7d574..6896b707b927 100644 --- a/platform/lang-impl/src/com/intellij/ide/ui/TargetPresentationMainRenderer.kt +++ b/platform/lang-impl/src/com/intellij/ide/ui/TargetPresentationMainRenderer.kt @@ -4,7 +4,6 @@ package com.intellij.ide.ui import com.intellij.navigation.LocationPresentation.DEFAULT_LOCATION_PREFIX import com.intellij.navigation.LocationPresentation.DEFAULT_LOCATION_SUFFIX import com.intellij.navigation.TargetPresentation -import com.intellij.openapi.project.Project import com.intellij.ui.ColoredListCellRenderer import com.intellij.ui.JBColor import com.intellij.ui.SimpleTextAttributes @@ -17,10 +16,7 @@ import org.jetbrains.annotations.ApiStatus.Experimental import javax.swing.JList @Experimental -abstract class TargetPresentationMainRenderer( - private val project: Project -) : ColoredListCellRenderer(), - SearchAwareRenderer { +abstract class TargetPresentationMainRenderer : ColoredListCellRenderer(), SearchAwareRenderer { protected abstract fun getPresentation(value: T): TargetPresentation? diff --git a/platform/lang-impl/src/com/intellij/ide/ui/renderers.kt b/platform/lang-impl/src/com/intellij/ide/ui/renderers.kt index 59a45b600920..8b0e62e6f4e0 100644 --- a/platform/lang-impl/src/com/intellij/ide/ui/renderers.kt +++ b/platform/lang-impl/src/com/intellij/ide/ui/renderers.kt @@ -2,14 +2,13 @@ package com.intellij.ide.ui import com.intellij.navigation.TargetPresentation -import com.intellij.openapi.project.Project import com.intellij.ui.list.LeftRightSearchAwareRenderer import com.intellij.ui.speedSearch.SearchAwareRenderer import org.jetbrains.annotations.ApiStatus.Experimental @Experimental -fun createTargetPresentationRenderer(project: Project, presentation: (T) -> TargetPresentation?): SearchAwareRenderer { - val mainRenderer = createMainRenderer(project, presentation) +fun createTargetPresentationRenderer(presentation: (T) -> TargetPresentation?): SearchAwareRenderer { + val mainRenderer = createMainRenderer(presentation) if (UISettings.instance.showIconInQuickNavigation) { val rightRenderer = createRightRenderer(presentation) return LeftRightSearchAwareRenderer(mainRenderer, rightRenderer) @@ -19,8 +18,8 @@ fun createTargetPresentationRenderer(project: Project, presentation: (T) -> } } -private fun createMainRenderer(project: Project, presentation: (T) -> TargetPresentation?): SearchAwareRenderer { - return object : TargetPresentationMainRenderer(project) { +private fun createMainRenderer(presentation: (T) -> TargetPresentation?): SearchAwareRenderer { + return object : TargetPresentationMainRenderer() { override fun getPresentation(value: T): TargetPresentation? = presentation(value) } } diff --git a/platform/lang-impl/src/com/intellij/navigation/chooser.kt b/platform/lang-impl/src/com/intellij/navigation/chooser.kt index 727d36fcdc88..a533cdb07563 100644 --- a/platform/lang-impl/src/com/intellij/navigation/chooser.kt +++ b/platform/lang-impl/src/com/intellij/navigation/chooser.kt @@ -6,21 +6,20 @@ package com.intellij.navigation import com.intellij.ide.ui.createTargetPresentationRenderer import com.intellij.openapi.editor.Editor import com.intellij.openapi.editor.ex.util.EditorUtil -import com.intellij.openapi.project.Project import com.intellij.openapi.ui.popup.JBPopupFactory import com.intellij.util.Consumer import org.jetbrains.annotations.ApiStatus.Experimental -fun chooseTarget(project: Project, editor: Editor, title: String, targets: List, handler: (NavigationTarget) -> Unit) { - chooseTarget(project, editor, title, targets, Consumer(handler)) +fun chooseTarget(editor: Editor, title: String, targets: List, handler: (NavigationTarget) -> Unit) { + chooseTarget(editor, title, targets, Consumer(handler)) } -fun chooseTarget(project: Project, editor: Editor, title: String, targets: List, consumer: Consumer) { +fun chooseTarget(editor: Editor, title: String, targets: List, consumer: Consumer) { targets.singleOrNull()?.let { consumer.consume(it) return } - val renderer = createTargetPresentationRenderer(project, NavigationTarget::getPresentationIfValid) + val renderer = createTargetPresentationRenderer(NavigationTarget::getPresentationIfValid) return JBPopupFactory.getInstance() .createPopupChooserBuilder(targets) .setRenderer(renderer)