MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

remove unused project property from TargetPresentationMainRenderer

Browse Source 
GitOrigin-RevId: 87a2f2ccbd09e4cdb0d17b2be687c5a2a8e196cd
This commit is contained in:
Daniil Ovchinnikov
2019-06-13 23:11:07 +03:00
committed by intellij-monorepo-bot
parent ceaa24deba
commit e5aabb8ae1
4 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationOnlyHandler2.kt
+1 -1
View File
@@ -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)
}
}
platform/lang-impl/src/com/intellij/ide/ui/TargetPresentationMainRenderer.kt
+1 -5
View File
@@ -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<T>(
private val project: Project
) : ColoredListCellRenderer<T>(),
SearchAwareRenderer<T> {
abstract class TargetPresentationMainRenderer<T> : ColoredListCellRenderer<T>(), SearchAwareRenderer<T> {
protected abstract fun getPresentation(value: T): TargetPresentation?
platform/lang-impl/src/com/intellij/ide/ui/renderers.kt
+4 -5
View File
@@ -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 <T> createTargetPresentationRenderer(project: Project, presentation: (T) -> TargetPresentation?): SearchAwareRenderer<T> {
val mainRenderer = createMainRenderer(project, presentation)
fun <T> createTargetPresentationRenderer(presentation: (T) -> TargetPresentation?): SearchAwareRenderer<T> {
val mainRenderer = createMainRenderer(presentation)
if (UISettings.instance.showIconInQuickNavigation) {
val rightRenderer = createRightRenderer(presentation)
return LeftRightSearchAwareRenderer(mainRenderer, rightRenderer)
@@ -19,8 +18,8 @@ fun <T> createTargetPresentationRenderer(project: Project, presentation: (T) ->
}
}
private fun <T> createMainRenderer(project: Project, presentation: (T) -> TargetPresentation?): SearchAwareRenderer<T> {
return object : TargetPresentationMainRenderer<T>(project) {
private fun <T> createMainRenderer(presentation: (T) -> TargetPresentation?): SearchAwareRenderer<T> {
return object : TargetPresentationMainRenderer<T>() {
override fun getPresentation(value: T): TargetPresentation? = presentation(value)
}
}
platform/lang-impl/src/com/intellij/navigation/chooser.kt
+4 -5
View File
@@ -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<NavigationTarget>, handler: (NavigationTarget) -> Unit) {
chooseTarget(project, editor, title, targets, Consumer(handler))
fun chooseTarget(editor: Editor, title: String, targets: List<NavigationTarget>, handler: (NavigationTarget) -> Unit) {
chooseTarget(editor, title, targets, Consumer(handler))
}
fun chooseTarget(project: Project, editor: Editor, title: String, targets: List<NavigationTarget>, consumer: Consumer<NavigationTarget>) {
fun chooseTarget(editor: Editor, title: String, targets: List<NavigationTarget>, consumer: Consumer<NavigationTarget>) {
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)