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

[ui] Fix list renderer in OccurrencesChooser

Browse Source 
#IJPL-58778 Fixed

GitOrigin-RevId: dcc5dc2d1f721befa9bfaa521221175fbf8e5dfd
This commit is contained in:
Louis Vignier
2024-07-30 19:26:13 +00:00
committed by intellij-monorepo-bot
parent 09c31334e9
commit 4a6aaaffd2
1 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/OccurrencesChooser.java
+8 -17
View File
@@ -11,17 +11,17 @@ import com.intellij.openapi.editor.markup.RangeHighlighter;
import com.intellij.openapi.ui.popup.JBPopupFactory;
import com.intellij.openapi.ui.popup.JBPopupListener;
import com.intellij.openapi.ui.popup.LightweightWindowEvent;
import com.intellij.openapi.ui.popup.ListItemDescriptorAdapter;
import com.intellij.openapi.util.Pass;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.PsiElement;
import com.intellij.refactoring.RefactoringBundle;
import com.intellij.ui.popup.list.GroupedItemsListRenderer;
import com.intellij.util.SlowOperations;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.*;
import java.util.List;
import java.util.*;
import java.util.function.Consumer;
@@ -113,22 +113,13 @@ public abstract class OccurrencesChooser<T> {
JBPopupFactory.getInstance()
.createPopupChooserBuilder(model)
.setRenderer(new DefaultListCellRenderer() {
.setRenderer(new GroupedItemsListRenderer<C>(new ListItemDescriptorAdapter<C>() {
@Override
public Component getListCellRendererComponent(final JList list,
final Object value,
final int index,
final boolean isSelected,
final boolean cellHasFocus) {
final Component rendererComponent = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
@SuppressWarnings("unchecked") final C choices = (C)value;
if (choices != null) {
setText(choices.formatDescription(occurrencesMap.get(choices).size()));
}
return rendererComponent;
public @Nullable String getTextFor(C value) {
if (value == null) return "";
return value.formatDescription(occurrencesMap.get(value).size());
}
})
}))
.setItemSelectedCallback(value -> {
if (value == null) return;
dropHighlighters();