MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-13 21:55:01 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix tests

Browse Source
This commit is contained in:
Maxim.Mossienko
2013-10-16 12:26:13 +02:00
parent 939d116ee4
commit 162b80fa39
2 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/ide/util/gotoByName/DefaultClassNavigationContributor.java
+14 -17
View File
@@ -32,8 +32,6 @@ import com.intellij.util.indexing.IdFilter;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
public class DefaultClassNavigationContributor implements ChooseByNameContributorEx, GotoClassContributor {
@Override
@NotNull
@@ -52,19 +50,10 @@ public class DefaultClassNavigationContributor implements ChooseByNameContributo
@Override
@NotNull
public NavigationItem[] getItemsByName(String name, final String pattern, Project project, boolean includeNonProjectItems) {
final GlobalSearchScope scope = includeNonProjectItems ? GlobalSearchScope.allScope(project) : GlobalSearchScope.projectScope(project);
return filterUnshowable(PsiShortNamesCache.getInstance(project).getClassesByName(name, scope), pattern);
}
CommonProcessors.CollectProcessor<NavigationItem> processor = new CommonProcessors.CollectProcessor<NavigationItem>();
processElementsWithName(name, processor, FindSymbolParameters.wrap(pattern, project, includeNonProjectItems));
private static NavigationItem[] filterUnshowable(PsiClass[] items, final String pattern) {
boolean isAnnotation = pattern.startsWith("@");
ArrayList<NavigationItem> list = new ArrayList<NavigationItem>(items.length);
for (PsiClass item : items) {
if (item.getContainingFile().getVirtualFile() == null) continue;
if (isAnnotation && !item.isAnnotationType()) continue;
list.add(item);
}
return list.toArray(new NavigationItem[list.size()]);
return processor.toArray(new NavigationItem[processor.getResults().size()]);
}
@Override
@@ -95,8 +84,16 @@ public class DefaultClassNavigationContributor implements ChooseByNameContributo
@Override
public void processElementsWithName(@NotNull String name,
@NotNull Processor<NavigationItem> processor,
@NotNull FindSymbolParameters parameters) {
PsiShortNamesCache.getInstance(parameters.getProject()).processClassesWithName(name, processor, parameters.getSearchScope(), parameters.getIdFilter());
@NotNull final Processor<NavigationItem> processor,
@NotNull final FindSymbolParameters parameters) {
PsiShortNamesCache.getInstance(parameters.getProject()).processClassesWithName(name, new Processor<PsiClass>() {
final boolean isAnnotation = parameters.getLocalPatternName().startsWith("@");
@Override
public boolean process(PsiClass aClass) {
if (aClass.getContainingFile().getVirtualFile() == null) return true;
if (isAnnotation && !aClass.isAnnotationType()) return true;
return processor.process(aClass);
}
}, parameters.getSearchScope(), parameters.getIdFilter());
}
}
java/java-tests/testSrc/com/intellij/navigation/ChooseByNameTest.groovy
+9 -1
View File
@@ -141,10 +141,18 @@ class Intf {
def popup = createPopup(new GotoFileModel(project), fooIndex)
assert getPopupElements(popup, "foo/") == [fooIndex.containingDirectory]
assert getPopupElements(popup, "foo\\") == [fooIndex.containingDirectory]
assert getPopupElements(popup, "foo") == [fooIndex.containingDirectory]
assert getPopupElements(popup, "/foo") == [fooIndex.containingDirectory]
assert getPopupElements(popup, "\\foo") == [fooIndex.containingDirectory]
assert getPopupElements(popup, "foo") == []
assert getPopupElements(popup, "/index.html") == [fooIndex]
assert getPopupElements(popup, "\\index.html") == [fooIndex]
assert getPopupElements(popup, "index.html/") == [fooIndex]
assert getPopupElements(popup, "index.html\\") == [fooIndex]
assert getPopupElements(popup, "bar.txt/") == [barIndex.containingDirectory]
assert getPopupElements(popup, "bar.txt\\") == [barIndex.containingDirectory]
assert getPopupElements(popup, "/bar.txt") == [barIndex.containingDirectory]
assert getPopupElements(popup, "\\bar.txt") == [barIndex.containingDirectory]
assert getPopupElements(popup, "bar.txt") == [barIndex]
popup.close(false)
}