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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Yann Cébron
2013-10-23 17:30:55 +02:00
parent 6a4d26a555 d206064747
commit ee5aec5cbc
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
+13 -10
View File
@@ -632,12 +632,15 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
@Override
public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
Component cmp;
PsiFile file;
PsiFile file = null;
myLocationString = null;
if (isMoreItem(index)) {
cmp = More.get(isSelected);
} else if (value instanceof VirtualFile && myProject != null && (file = PsiManager.getInstance(myProject).findFile((VirtualFile)value)) != null) {
cmp = new GotoFileCellRenderer(list.getWidth()).getListCellRendererComponent(list, file, index, isSelected, cellHasFocus);
} else if (value instanceof VirtualFile
&& myProject != null
&& (((VirtualFile)value).isDirectory()
|| (file = PsiManager.getInstance(myProject).findFile((VirtualFile)value)) != null)) {
cmp = new GotoFileCellRenderer(list.getWidth()).getListCellRendererComponent(list, file == null ? value : file, index, isSelected, cellHasFocus);
} else if (value instanceof PsiElement) {
cmp = myPsiRenderer.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
} else {
@@ -952,7 +955,7 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
myFiles = myFileModel.getNames(false);
}
List<MatchResult> matches = collectResults(pattern, myFiles, myFileModel);
final List<VirtualFile> files = new ArrayList<VirtualFile>();
final List<Object> files = new ArrayList<Object>();
FindSymbolParameters parameters = FindSymbolParameters.wrap(pattern, project, false);
final int maxFiles = 8;
for (MatchResult o : matches) {
@@ -963,14 +966,14 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
if (!myListModel.contains(object)) {
if (object instanceof PsiFile) {
object = ((PsiFile)object).getVirtualFile();
} else if (object instanceof PsiDirectory) {
object = ((PsiDirectory)object).getVirtualFile();
}
if (object instanceof VirtualFile
&& !myAlreadyAddedFiles.contains((VirtualFile)object)
if ((object instanceof VirtualFile || object instanceof PsiDirectory)
&& !myAlreadyAddedFiles.contains(object)
/*&& !((VirtualFile)object).isDirectory()*/) {
files.add((VirtualFile)object);
myAlreadyAddedFiles.add((VirtualFile)object);
files.add(object);
if (object instanceof VirtualFile) {
myAlreadyAddedFiles.add((VirtualFile)object);
}
filesCounter++;
if (filesCounter > maxFiles) break;
}