diff --git a/java/java-tests/testSrc/com/intellij/java/navigation/SearchEverywhereTabsCustomizationTest.kt b/java/java-tests/testSrc/com/intellij/java/navigation/SearchEverywhereTabsCustomizationTest.kt index c1ee69a60f24..745e12b2ecfb 100644 --- a/java/java-tests/testSrc/com/intellij/java/navigation/SearchEverywhereTabsCustomizationTest.kt +++ b/java/java-tests/testSrc/com/intellij/java/navigation/SearchEverywhereTabsCustomizationTest.kt @@ -56,7 +56,6 @@ class SearchEverywhereTabsCustomizationTest : LightJavaCodeInsightFixtureTestCas override fun showInFindResults(): Boolean = false override fun isShownInSeparateTab(): Boolean = showTab override fun getElementsRenderer(): ListCellRenderer = ListCellRenderer { _, _, _, _, _ -> JPanel() } - override fun getDataForItem(element: Unit, dataId: String): Any? = null override fun processSelectedItem(selected: Unit, modifiers: Int, searchText: String): Boolean = false override fun fetchElements(pattern: String, progressIndicator: ProgressIndicator, consumer: Processor) {} } diff --git a/java/java-tests/testSrc/com/intellij/java/navigation/SearchEverywhereTest.kt b/java/java-tests/testSrc/com/intellij/java/navigation/SearchEverywhereTest.kt index c847978a63ea..4346389ae04a 100644 --- a/java/java-tests/testSrc/com/intellij/java/navigation/SearchEverywhereTest.kt +++ b/java/java-tests/testSrc/com/intellij/java/navigation/SearchEverywhereTest.kt @@ -15,6 +15,7 @@ import com.intellij.openapi.progress.ProgressIndicator import com.intellij.openapi.util.Disposer import com.intellij.testFramework.PlatformTestUtil.waitForFuture import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase +import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase.assertEquals import com.intellij.util.Processor import org.mockito.Mockito import javax.swing.DefaultListCellRenderer @@ -302,8 +303,6 @@ class SearchEverywhereTest : LightJavaCodeInsightFixtureTestCase() { override fun processSelectedItem(selected: Any, modifiers: Int, searchText: String): Boolean = false override fun getElementsRenderer(): ListCellRenderer = DefaultListCellRenderer() - - override fun getDataForItem(element: Any, dataId: String): Any? = null } private class StubAction(text: String) : AnAction(text) { diff --git a/platform/lang-api/api-dump-unreviewed.txt b/platform/lang-api/api-dump-unreviewed.txt index a41420a5a3d8..1464137d9195 100644 --- a/platform/lang-api/api-dump-unreviewed.txt +++ b/platform/lang-api/api-dump-unreviewed.txt @@ -2817,7 +2817,7 @@ com.intellij.ide.actions.searcheverywhere.SearchEverywhereContributor - filterControlSymbols(java.lang.String):java.lang.String - getActions(java.lang.Runnable):java.util.List - getAdvertisement():java.lang.String -- a:getDataForItem(java.lang.Object,java.lang.String):java.lang.Object +- getDataForItem(java.lang.Object,java.lang.String):java.lang.Object - getElementPriority(java.lang.Object,java.lang.String):I - a:getElementsRenderer():javax.swing.ListCellRenderer - getFullGroupName():java.lang.String diff --git a/platform/lang-api/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereContributor.java b/platform/lang-api/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereContributor.java index 51916edc7895..7634e676a15e 100644 --- a/platform/lang-api/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereContributor.java +++ b/platform/lang-api/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereContributor.java @@ -201,7 +201,9 @@ public interface SearchEverywhereContributor extends PossiblyDumbAware, Di * @see DataContext */ @Nullable - Object getDataForItem(@NotNull Item element, @NotNull String dataId); + default Object getDataForItem(@NotNull Item element, @NotNull String dataId) { + return null; + } /** * String description for elements in suggestions list. One should check passed element explicitly for it's validity. diff --git a/platform/lang-api/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereSpellingCorrector.kt b/platform/lang-api/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereSpellingCorrector.kt index 17d02ed43d69..d54e5d250567 100644 --- a/platform/lang-api/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereSpellingCorrector.kt +++ b/platform/lang-api/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereSpellingCorrector.kt @@ -52,5 +52,4 @@ class SearchEverywhereSpellingCorrectorContributor(private val textComponent: JT return false } override fun getElementsRenderer(): ListCellRenderer = SearchEverywhereSpellingElementRenderer() - override fun getDataForItem(element: SearchEverywhereSpellCheckResult.Correction, dataId: String): Any? = null } \ No newline at end of file diff --git a/platform/lang-impl/api-dump-unreviewed.txt b/platform/lang-impl/api-dump-unreviewed.txt index 2c7b8a24425d..69699b67e9ff 100644 --- a/platform/lang-impl/api-dump-unreviewed.txt +++ b/platform/lang-impl/api-dump-unreviewed.txt @@ -13948,7 +13948,6 @@ f:com.intellij.ide.actions.searcheverywhere.RunConfigurationsSEContributor - com.intellij.ide.actions.searcheverywhere.SearchEverywhereContributor - (com.intellij.openapi.project.Project,java.awt.Component,java.util.function.Supplier):V - fetchElements(java.lang.String,com.intellij.openapi.progress.ProgressIndicator,com.intellij.util.Processor):V -- getDataForItem(com.intellij.execution.actions.ChooseRunConfigurationPopup$ItemWrapper,java.lang.String):java.lang.Object - getElementsRenderer():javax.swing.ListCellRenderer - getGroupName():java.lang.String - getSearchProviderId():java.lang.String @@ -14221,7 +14220,6 @@ f:com.intellij.ide.actions.searcheverywhere.TopHitSEContributor - sf:TOP_HIT_ELEMENT_PRIORITY:I - (com.intellij.openapi.project.Project,java.awt.Component,java.util.function.Consumer):V - fetchElements(java.lang.String,com.intellij.openapi.progress.ProgressIndicator,com.intellij.util.Processor):V -- getDataForItem(java.lang.Object,java.lang.String):java.lang.Object - getElementPriority(java.lang.Object,java.lang.String):I - getElementsRenderer():javax.swing.ListCellRenderer - getGroupName():java.lang.String diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/AutoCompletionProvider.java b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/AutoCompletionProvider.java index 3dda5985be65..ac3adfdb0ae7 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/AutoCompletionProvider.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/AutoCompletionProvider.java @@ -12,7 +12,6 @@ import com.intellij.util.ui.EmptyIcon; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import javax.swing.*; import javax.swing.text.JTextComponent; @@ -84,12 +83,6 @@ final class AutoCompletionProvider { public @NotNull ListCellRenderer getElementsRenderer() { return new CommandRenderer(); } - - @Override - public @Nullable Object getDataForItem(@NotNull AutoCompletionCommand element, - @NotNull String dataId) { - return null; - } } private static final class CommandRenderer extends SimpleColoredComponent implements ListCellRenderer { diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/CalculatorSEContributor.kt b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/CalculatorSEContributor.kt index ec90bee67991..c4e197ad69c4 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/CalculatorSEContributor.kt +++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/CalculatorSEContributor.kt @@ -66,8 +66,6 @@ private class CalculatorSEContributor : WeightedSearchEverywhereContributor getElementsRenderer() { return renderer; diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java index 4644ae0a9c35..b71a140ee4ae 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java @@ -504,7 +504,7 @@ public final class SearchEverywhereUI extends BigPopupUI implements UiDataProvid } } - private static @Nullable Object getDataFromElementInfo(@NotNull String dataId, SearchEverywhereFoundElementInfo info) { + private static @Nullable Object getDataFromElementInfo(@NotNull String dataId, @NotNull SearchEverywhereFoundElementInfo info) { //noinspection unchecked SearchEverywhereContributor contributor = (SearchEverywhereContributor)info.getContributor(); if (contributor == null) return null; @@ -1940,11 +1940,6 @@ public final class SearchEverywhereUI extends BigPopupUI implements UiDataProvid public @NotNull ListCellRenderer getElementsRenderer() { return myCommandRenderer; } - - @Override - public @Nullable Object getDataForItem(@NotNull Object element, @NotNull String dataId) { - return null; - } }; private static final class HintHelper { diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/TopHitSEContributor.java b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/TopHitSEContributor.java index d552a08e61a2..5875364b5023 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/TopHitSEContributor.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/TopHitSEContributor.java @@ -93,11 +93,6 @@ public final class TopHitSEContributor implements SearchEverywhereContributor { throw UnsupportedOperationException() } - - override fun getDataForItem(element: Any, dataId: String): Any? { - return null - } } } diff --git a/platform/lang-impl/testSources/com/intellij/ide/actions/searcheverywhere/MultiThreadSearchDeadlockTest.java b/platform/lang-impl/testSources/com/intellij/ide/actions/searcheverywhere/MultiThreadSearchDeadlockTest.java index 731caaa685d4..0af2caaa6251 100644 --- a/platform/lang-impl/testSources/com/intellij/ide/actions/searcheverywhere/MultiThreadSearchDeadlockTest.java +++ b/platform/lang-impl/testSources/com/intellij/ide/actions/searcheverywhere/MultiThreadSearchDeadlockTest.java @@ -11,7 +11,6 @@ import com.intellij.util.Alarm; import com.intellij.util.Processor; import com.intellij.util.ThrowableRunnable; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import org.junit.Assert; import javax.swing.*; @@ -205,12 +204,6 @@ public class MultiThreadSearchDeadlockTest extends BasePlatformTestCase { return false; } - @Nullable - @Override - public Object getDataForItem(@NotNull Object element, @NotNull String dataId) { - return null; - } - @NotNull @Override public ListCellRenderer getElementsRenderer() { diff --git a/platform/lang-impl/testSources/com/intellij/ide/actions/searcheverywhere/MultiThreadSearchTest.java b/platform/lang-impl/testSources/com/intellij/ide/actions/searcheverywhere/MultiThreadSearchTest.java index 13597740ced8..83f3e386a825 100644 --- a/platform/lang-impl/testSources/com/intellij/ide/actions/searcheverywhere/MultiThreadSearchTest.java +++ b/platform/lang-impl/testSources/com/intellij/ide/actions/searcheverywhere/MultiThreadSearchTest.java @@ -200,10 +200,6 @@ public class MultiThreadSearchTest extends BasePlatformTestCase { throw new UnsupportedOperationException(); } - @Override - public Object getDataForItem(@NotNull Object element, @NotNull String dataId) { - return null; - } }; } diff --git a/platform/lang-impl/testSources/com/intellij/ide/actions/searcheverywhere/SETestUtil.kt b/platform/lang-impl/testSources/com/intellij/ide/actions/searcheverywhere/SETestUtil.kt index d9b56c7f5286..fd7e0688838c 100644 --- a/platform/lang-impl/testSources/com/intellij/ide/actions/searcheverywhere/SETestUtil.kt +++ b/platform/lang-impl/testSources/com/intellij/ide/actions/searcheverywhere/SETestUtil.kt @@ -14,7 +14,6 @@ fun createDumbContributor(id: String, showTab: Boolean = false, essential: Boole override fun showInFindResults(): Boolean = false override fun isShownInSeparateTab(): Boolean = showTab override fun getElementsRenderer(): ListCellRenderer = ListCellRenderer { _, _, _, _, _ -> JPanel() } - override fun getDataForItem(element: Unit, dataId: String): Any? = null override fun processSelectedItem(selected: Unit, modifiers: Int, searchText: String): Boolean = false override fun fetchElements(pattern: String, progressIndicator: ProgressIndicator, consumer: Processor) {} diff --git a/platform/lang-impl/testSources/com/intellij/ide/actions/searcheverywhere/SearchModelTest.java b/platform/lang-impl/testSources/com/intellij/ide/actions/searcheverywhere/SearchModelTest.java index 2441147f4d05..1d89c69d7248 100644 --- a/platform/lang-impl/testSources/com/intellij/ide/actions/searcheverywhere/SearchModelTest.java +++ b/platform/lang-impl/testSources/com/intellij/ide/actions/searcheverywhere/SearchModelTest.java @@ -5,7 +5,6 @@ import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.testFramework.fixtures.BasePlatformTestCase; import com.intellij.util.Processor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import org.junit.Assert; import javax.swing.*; @@ -216,12 +215,6 @@ public class SearchModelTest extends BasePlatformTestCase { public ListCellRenderer getElementsRenderer() { throw new UnsupportedOperationException(); } - - @Nullable - @Override - public Object getDataForItem(@NotNull Object element, @NotNull String dataId) { - return null; - } }; } } diff --git a/plugins/git4idea/src/git4idea/search/GitSearchEverywhereContributor.kt b/plugins/git4idea/src/git4idea/search/GitSearchEverywhereContributor.kt index 05ef746ef76a..044112301e4e 100644 --- a/plugins/git4idea/src/git4idea/search/GitSearchEverywhereContributor.kt +++ b/plugins/git4idea/src/git4idea/search/GitSearchEverywhereContributor.kt @@ -201,8 +201,6 @@ internal class GitSearchEverywhereContributor(private val project: Project) : We && VcsProjectLog.getInstance(project).logManager != null } - override fun getDataForItem(element: Any, dataId: String): Any? = null - class Factory : SearchEverywhereContributorFactory { override fun createContributor(initEvent: AnActionEvent): GitSearchEverywhereContributor { val project = initEvent.getRequiredData(CommonDataKeys.PROJECT) diff --git a/plugins/search-everywhere-ml/ranking/core/test/com/intellij/searchEverywhereMl/ranking/core/MockSearchEverywhereContributor.kt b/plugins/search-everywhere-ml/ranking/core/test/com/intellij/searchEverywhereMl/ranking/core/MockSearchEverywhereContributor.kt index 92a0b5eb1168..6c3c2e1a1753 100644 --- a/plugins/search-everywhere-ml/ranking/core/test/com/intellij/searchEverywhereMl/ranking/core/MockSearchEverywhereContributor.kt +++ b/plugins/search-everywhere-ml/ranking/core/test/com/intellij/searchEverywhereMl/ranking/core/MockSearchEverywhereContributor.kt @@ -24,7 +24,6 @@ class MockSearchEverywhereContributor(val name: String? = null, } } - override fun getDataForItem(element: Any, dataId: String) = null override fun processSelectedItem(selected: Any, modifiers: Int, searchText: String) = closeOnItemSelection override fun fetchElements(pattern: String, progressIndicator: ProgressIndicator, consumer: Processor) { // We have to use runProcess here until the SE is not moved to coroutines API completely diff --git a/plugins/search-everywhere-ml/typos/testSrc/com/intellij/searchEverywhereMl/typos/SearchEverywhereTyposUITest.kt b/plugins/search-everywhere-ml/typos/testSrc/com/intellij/searchEverywhereMl/typos/SearchEverywhereTyposUITest.kt index 47fd5f11c066..d0120c77c2a5 100644 --- a/plugins/search-everywhere-ml/typos/testSrc/com/intellij/searchEverywhereMl/typos/SearchEverywhereTyposUITest.kt +++ b/plugins/search-everywhere-ml/typos/testSrc/com/intellij/searchEverywhereMl/typos/SearchEverywhereTyposUITest.kt @@ -1,6 +1,9 @@ package com.intellij.searchEverywhereMl.typos -import com.intellij.ide.actions.searcheverywhere.* +import com.intellij.ide.actions.searcheverywhere.SearchEverywhereContributor +import com.intellij.ide.actions.searcheverywhere.SearchEverywhereSpellCheckResult +import com.intellij.ide.actions.searcheverywhere.SearchEverywhereSpellingCorrector +import com.intellij.ide.actions.searcheverywhere.SearchEverywhereUI import com.intellij.ide.ui.IdeUiService import com.intellij.openapi.actionSystem.PlatformDataKeys import com.intellij.openapi.progress.ProgressIndicator @@ -31,7 +34,6 @@ private class MockSearchEverywhereContributor(private val elements: Collection consumer, @NotNull String pattern) { if (ActionUtil.isDumbMode(myProject)) { return;