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

IDEA-172063 find in path preview hides file extension if filter mask is set, even if several extensions are allowed

Browse Source 
GitOrigin-RevId: 540d78cfd136722910e355f46fe79d65a52a47e3
This commit is contained in:
Vassiliy.Kudryashov
2019-08-12 17:03:47 +03:00
committed by intellij-monorepo-bot
parent 7bd962bd8a
commit c8f81cccbe
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java
+3 -12
View File
@@ -38,7 +38,6 @@ import com.intellij.openapi.ui.popup.JBPopup;
import com.intellij.openapi.ui.popup.JBPopupFactory;
import com.intellij.openapi.ui.popup.ListPopup;
import com.intellij.openapi.util.*;
import com.intellij.openapi.util.io.FileUtilRt;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VfsUtilCore;
@@ -1156,8 +1155,7 @@ public class FindPopupPanel extends JBPanel implements FindUI {
GlobalSearchScope scope = GlobalSearchScopeUtil.toGlobalSearchScope(
FindInProjectUtil.getScopeFromModel(myProject, myHelper.myPreviousModel), myProject);
myResultsPreviewTable.getColumnModel().getColumn(0).setCellRenderer(
new UsageTableCellRenderer(myCbFileFilter.isSelected(), false, scope));
myResultsPreviewTable.getColumnModel().getColumn(0).setCellRenderer(new UsageTableCellRenderer(scope));
onStart(hash);
final AtomicInteger resultsCount = new AtomicInteger();
@@ -1662,7 +1660,6 @@ public class FindPopupPanel extends JBPanel implements FindUI {
@NotNull
private SimpleTextAttributes getAttributes(@NotNull TextChunk textChunk) {
SimpleTextAttributes at = textChunk.getSimpleAttributesIgnoreBackground();
if (myUseBold) return at;
boolean highlighted = textChunk.getType() != null || at.getFontStyle() == Font.BOLD;
return highlighted
? new SimpleTextAttributes(null, at.getFgColor(), at.getWaveColor(),
@@ -1694,9 +1691,7 @@ public class FindPopupPanel extends JBPanel implements FindUI {
@NotNull
private String getFilePath(@NotNull UsageInfo2UsageAdapter ua) {
String uniquePath =
UniqueVFilePathBuilder.getInstance().getUniqueVirtualFilePath(ua.getUsageInfo().getProject(), ua.getFile(), myScope);
return myOmitFileExtension ? FileUtilRt.getNameWithoutExtension(uniquePath) : uniquePath;
return UniqueVFilePathBuilder.getInstance().getUniqueVirtualFilePath(ua.getUsageInfo().getProject(), ua.getFile(), myScope);
}
@Nullable
@@ -1708,13 +1703,9 @@ public class FindPopupPanel extends JBPanel implements FindUI {
};
private static final int MARGIN = 2;
private final boolean myOmitFileExtension;
private final boolean myUseBold;
private final GlobalSearchScope myScope;
UsageTableCellRenderer(boolean omitFileExtension, boolean useBold, GlobalSearchScope scope) {
myOmitFileExtension = omitFileExtension;
myUseBold = useBold;
UsageTableCellRenderer(GlobalSearchScope scope) {
myScope = scope;
setLayout(new BorderLayout());
add(myUsageRenderer, BorderLayout.CENTER);