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

OC-9697 Include ObjC symbols into search everywhere

Browse Source 
fix duplication, add custom renderer
This commit is contained in:
Philipp Smorygo
2015-11-09 16:13:11 +03:00
parent 749aeb1138
commit f0eb6d989c
3 changed files with 66 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/actions/DefaultSearchEverywhereClassifier.java
+9
View File
@@ -22,6 +22,9 @@ import com.intellij.psi.PsiFile;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.*;
public class DefaultSearchEverywhereClassifier implements SearchEverywhereClassifier {
@Override
public boolean isClass(@Nullable Object o) {
@@ -47,4 +50,10 @@ public class DefaultSearchEverywhereClassifier implements SearchEverywhereClassi
}
return null;
}
@Nullable
@Override
public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
return null;
}
}
platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
+42 -26
View File
@@ -1107,23 +1107,29 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
Matcher matcher = NameUtil.buildMatcher(pattern, 0, true, true);
if (isMoreItem(index)) {
cmp = More.get(isSelected);
} else if (value instanceof VirtualFile
&& myProject != null
&& ((((VirtualFile)value).isDirectory() && (file = PsiManager.getInstance(myProject).findDirectory((VirtualFile)value)) != null )
|| (file = PsiManager.getInstance(myProject).findFile((VirtualFile)value)) != null)) {
myFileRenderer.setPatternMatcher(matcher);
cmp = myFileRenderer.getListCellRendererComponent(list, file, index, isSelected, cellHasFocus);
} else if (value instanceof PsiElement) {
myFileRenderer.setPatternMatcher(matcher);
cmp = myFileRenderer.getListCellRendererComponent(list, value, index, isSelected, isSelected);
} else if (value instanceof GotoActionModel.ActionWrapper) {
cmp = myActionsRenderer.getListCellRendererComponent(list, new GotoActionModel.MatchedValue(((GotoActionModel.ActionWrapper)value), pattern), index, isSelected, isSelected);
} else {
cmp = super.getListCellRendererComponent(list, value, index, isSelected, isSelected);
final JPanel p = new JPanel(new BorderLayout());
p.setBackground(UIUtil.getListBackground(isSelected));
p.add(cmp, BorderLayout.CENTER);
cmp = p;
cmp = SearchEverywhereClassifier.EP_Manager.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
}
if (cmp == null) {
if (value instanceof VirtualFile
&& myProject != null
&& ((((VirtualFile)value).isDirectory() && (file = PsiManager.getInstance(myProject).findDirectory((VirtualFile)value)) != null)
|| (file = PsiManager.getInstance(myProject).findFile((VirtualFile)value)) != null)) {
myFileRenderer.setPatternMatcher(matcher);
cmp = myFileRenderer.getListCellRendererComponent(list, file, index, isSelected, cellHasFocus);
} else if (value instanceof PsiElement) {
myFileRenderer.setPatternMatcher(matcher);
cmp = myFileRenderer.getListCellRendererComponent(list, value, index, isSelected, isSelected);
} else if (value instanceof GotoActionModel.ActionWrapper) {
cmp = myActionsRenderer.getListCellRendererComponent(list, new GotoActionModel.MatchedValue(((GotoActionModel.ActionWrapper)value), pattern), index, isSelected, isSelected);
} else {
cmp = super.getListCellRendererComponent(list, value, index, isSelected, isSelected);
final JPanel p = new JPanel(new BorderLayout());
p.setBackground(UIUtil.getListBackground(isSelected));
p.add(cmp, BorderLayout.CENTER);
cmp = p;
}
}
if (myLocationString != null || value instanceof BooleanOptionDescription) {
final JPanel panel = new JPanel(new BorderLayout());
@@ -1739,13 +1745,18 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
@Override
public boolean process(Object o) {
if (SearchEverywhereClassifier.EP_Manager.isSymbol(o) && !myListModel.contains(o) && !symbols.contains(o)) {
PsiElement element = null;
if (o instanceof PsiElement) {
element = (PsiElement)o;
}
else if (o instanceof PsiElementNavigationItem) {
element = ((PsiElementNavigationItem)o).getTargetElement();
}
VirtualFile virtualFile = SearchEverywhereClassifier.EP_Manager.getVirtualFile(o);
//some elements are non-physical like DB columns
if (o instanceof PsiElementNavigationItem) {
o = ((PsiElementNavigationItem)o).getTargetElement();
}
if ((o instanceof PsiElement && ((PsiElement)o).getContainingFile() == null) ||
(virtualFile != null && (includeLibs || scope.accept(virtualFile)))) {
boolean isElementWithoutFile = element != null && element.getContainingFile() == null;
boolean isFileInScope = virtualFile != null && (includeLibs || scope.accept(virtualFile));
if (isElementWithoutFile || isFileInScope) {
symbols.add(o);
}
}
@@ -1775,13 +1786,18 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
classes.needMore = true;
return false;
}
PsiElement element = null;
if (o instanceof PsiElement) {
element = (PsiElement)o;
}
else if (o instanceof PsiElementNavigationItem) {
element = ((PsiElementNavigationItem)o).getTargetElement();
}
classes.add(o);
if (o instanceof PsiElementNavigationItem) {
o = ((PsiElementNavigationItem)o).getTargetElement();
}
if (o instanceof PsiNamedElement) {
final String name = ((PsiNamedElement)o).getName();
if (element instanceof PsiNamedElement) {
final String name = ((PsiNamedElement)element).getName();
VirtualFile virtualFile = SearchEverywhereClassifier.EP_Manager.getVirtualFile(o);
if (virtualFile != null) {
if (StringUtil.equals(name, virtualFile.getNameWithoutExtension())) {
platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereClassifier.java
+15
View File
@@ -21,6 +21,9 @@ import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.*;
/**
* @author Philipp Smorygo
*/
@@ -50,6 +53,15 @@ public interface SearchEverywhereClassifier {
}
return null;
}
@Nullable
public static Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
for (SearchEverywhereClassifier classifier : Extensions.getExtensions(SearchEverywhereClassifier.EP_NAME)) {
Component component = classifier.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
if (component != null) return component;
}
return null;
}
}
ExtensionPointName<SearchEverywhereClassifier> EP_NAME = ExtensionPointName.create("com.intellij.searchEverywhereClassifier");
@@ -60,4 +72,7 @@ public interface SearchEverywhereClassifier {
@Nullable
VirtualFile getVirtualFile(@NotNull Object o);
@Nullable
Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus);
}