MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-14 00:40:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

drop trivial getDataForItem overrides

Browse Source 
GitOrigin-RevId: 3bb46d30fc88d19510c8c6aba6d15b1dba839f03
This commit is contained in:
Gregory.Shrago
2024-08-14 21:19:18 +04:00
committed by intellij-monorepo-bot
parent c747b110fc
commit 1f8f8acf33
20 changed files with 11 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
java/java-tests/testSrc/com/intellij/java/navigation/SearchEverywhereTabsCustomizationTest.kt
View File

@@ -56,7 +56,6 @@ class SearchEverywhereTabsCustomizationTest : LightJavaCodeInsightFixtureTestCas
override fun showInFindResults(): Boolean = false
override fun isShownInSeparateTab(): Boolean = showTab
override fun getElementsRenderer(): ListCellRenderer<in Unit> = 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<in Unit>) {}
}

3
java/java-tests/testSrc/com/intellij/java/navigation/SearchEverywhereTest.kt
View File

@@ -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<in Any> = DefaultListCellRenderer()
override fun getDataForItem(element: Any, dataId: String): Any? = null
}
private class StubAction(text: String) : AnAction(text) {

2
platform/lang-api/api-dump-unreviewed.txt
View File

@@ -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

4
platform/lang-api/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereContributor.java
View File

@@ -201,7 +201,9 @@ public interface SearchEverywhereContributor<Item> 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.

1
platform/lang-api/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereSpellingCorrector.kt
View File

@@ -52,5 +52,4 @@ class SearchEverywhereSpellingCorrectorContributor(private val textComponent: JT
return false
}
override fun getElementsRenderer(): ListCellRenderer<in SearchEverywhereSpellCheckResult.Correction> = SearchEverywhereSpellingElementRenderer()
override fun getDataForItem(element: SearchEverywhereSpellCheckResult.Correction, dataId: String): Any? = null
}

2
platform/lang-impl/api-dump-unreviewed.txt
View File

@@ -13948,7 +13948,6 @@ f:com.intellij.ide.actions.searcheverywhere.RunConfigurationsSEContributor
- com.intellij.ide.actions.searcheverywhere.SearchEverywhereContributor
- <init>(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
- <init>(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

7
platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/AutoCompletionProvider.java
View File

@@ -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<? super AutoCompletionCommand> 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<AutoCompletionCommand> {

2
platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/CalculatorSEContributor.kt
View File

@@ -66,8 +66,6 @@ private class CalculatorSEContributor : WeightedSearchEverywhereContributor<Eval
consumer.process(FoundItemDescriptor(EvaluationResult(result, pattern), 0x8000))
}
override fun getDataForItem(element: EvaluationResult, dataId: String): Any? = null
override fun processSelectedItem(selected: EvaluationResult, modifiers: Int, searchText: String): Boolean {
CopyPasteManager.getInstance().setContents(StringSelection(selected.value))
return true

5
platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/RunConfigurationsSEContributor.java
View File

@@ -94,11 +94,6 @@ public final class RunConfigurationsSEContributor implements SearchEverywhereCon
return true;
}
@Override
public @Nullable Object getDataForItem(@NotNull ChooseRunConfigurationPopup.ItemWrapper element, @NotNull String dataId) {
return null;
}
@Override
public @NotNull ListCellRenderer<? super ChooseRunConfigurationPopup.ItemWrapper> getElementsRenderer() {
return renderer;

7
platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java
View File

@@ -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<Object> contributor = (SearchEverywhereContributor<Object>)info.getContributor();
if (contributor == null) return null;
@@ -1940,11 +1940,6 @@ public final class SearchEverywhereUI extends BigPopupUI implements UiDataProvid
public @NotNull ListCellRenderer<? super Object> getElementsRenderer() {
return myCommandRenderer;
}
@Override
public @Nullable Object getDataForItem(@NotNull Object element, @NotNull String dataId) {
return null;
}
};
private static final class HintHelper {

5
platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/TopHitSEContributor.java
View File

@@ -93,11 +93,6 @@ public final class TopHitSEContributor implements SearchEverywhereContributor<Ob
return res;
}
@Override
public Object getDataForItem(@NotNull Object element, @NotNull String dataId) {
return null;
}
@Override
public boolean processSelectedItem(@NotNull Object selected, int modifiers, @NotNull String text) {
if (selected instanceof BooleanOptionDescription option) {

11
platform/lang-impl/testSources/com/intellij/ide/actions/searcheverywhere/MixingMultiThreadSearchTest.kt
View File

@@ -10,12 +10,7 @@ import com.intellij.util.Alarm
import com.intellij.util.Processor
import org.codehaus.groovy.runtime.DefaultGroovyMethods
import org.junit.Assert
import java.lang.UnsupportedOperationException
import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.Executor
import java.util.concurrent.Phaser
import java.util.concurrent.TimeUnit
import java.util.concurrent.TimeoutException
import java.util.concurrent.*
import java.util.concurrent.atomic.AtomicBoolean
import javax.swing.ListCellRenderer
@@ -320,10 +315,6 @@ class MixingMultiThreadSearchTest : BasePlatformTestCase() {
override fun getElementsRenderer(): ListCellRenderer<in Any?> {
throw UnsupportedOperationException()
}
override fun getDataForItem(element: Any, dataId: String): Any? {
return null
}
}
}

7
platform/lang-impl/testSources/com/intellij/ide/actions/searcheverywhere/MultiThreadSearchDeadlockTest.java
View File

@@ -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<? super Object> getElementsRenderer() {

4
platform/lang-impl/testSources/com/intellij/ide/actions/searcheverywhere/MultiThreadSearchTest.java
View File

@@ -200,10 +200,6 @@ public class MultiThreadSearchTest extends BasePlatformTestCase {
throw new UnsupportedOperationException();
}
@Override
public Object getDataForItem(@NotNull Object element, @NotNull String dataId) {
return null;
}
};
}

1
platform/lang-impl/testSources/com/intellij/ide/actions/searcheverywhere/SETestUtil.kt
View File

@@ -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<in Unit> = 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<in Unit>) {}

7
platform/lang-impl/testSources/com/intellij/ide/actions/searcheverywhere/SearchModelTest.java
View File

@@ -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<? super Object> getElementsRenderer() {
throw new UnsupportedOperationException();
}
@Nullable
@Override
public Object getDataForItem(@NotNull Object element, @NotNull String dataId) {
return null;
}
};
}
}

2
plugins/git4idea/src/git4idea/search/GitSearchEverywhereContributor.kt
View File

@@ -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<Any> {
override fun createContributor(initEvent: AnActionEvent): GitSearchEverywhereContributor {
val project = initEvent.getRequiredData(CommonDataKeys.PROJECT)

1
plugins/search-everywhere-ml/ranking/core/test/com/intellij/searchEverywhereMl/ranking/core/MockSearchEverywhereContributor.kt
View File

@@ -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<in Any>) {
// We have to use runProcess here until the SE is not moved to coroutines API completely

6
plugins/search-everywhere-ml/typos/testSrc/com/intellij/searchEverywhereMl/typos/SearchEverywhereTyposUITest.kt
View File

@@ -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<S
override fun getSearchProviderId(): String = this::class.java.simpleName
override fun getGroupName(): String = this::class.java.simpleName
override fun getDataForItem(element: String, dataId: String): Any? = null
override fun getSortWeight(): Int = 0
override fun showInFindResults(): Boolean = true
override fun processSelectedItem(selected: String, modifiers: Int, searchText: String): Boolean = true

5
plugins/yaml/src/org/jetbrains/yaml/navigation/YAMLKeysSearchEverywhereContributor.java
View File

@@ -87,11 +87,6 @@ public class YAMLKeysSearchEverywhereContributor implements SearchEverywhereCont
return new NavigationItemListCellRenderer();
}
@Override
public Object getDataForItem(@NotNull YAMLKeyNavigationItem element, @NotNull String dataId) {
return null;
}
private void findKeys(@NotNull Processor<? super YAMLKeyNavigationItem> consumer, @NotNull String pattern) {
if (ActionUtil.isDumbMode(myProject)) {
return;