From 0d86a404064be0257eb0724d051139c9dd2d0477 Mon Sep 17 00:00:00 2001 From: Peter Gromov Date: Tue, 9 Jun 2020 13:28:24 +0200 Subject: [PATCH] restore simple navigation in Java during indexing GitOrigin-RevId: 94e0c54ff310d4e6bd0d589f8b9a9f14606bab72 --- .../src/com/intellij/psi/impl/JavaPsiFacadeImpl.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/JavaPsiFacadeImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/JavaPsiFacadeImpl.java index 50ed1759ca11..1c2f2895f588 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/JavaPsiFacadeImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/JavaPsiFacadeImpl.java @@ -100,7 +100,7 @@ public class JavaPsiFacadeImpl extends JavaPsiFacadeEx { return null; } - List finders = finders(); + List finders = filteredFinders(); Condition classesFilter = getFilterFromFinders(scope, finders); for (PsiElementFinder finder : finders) { @@ -167,7 +167,7 @@ public class JavaPsiFacadeImpl extends JavaPsiFacadeEx { if (shouldUseSlowResolve()) { return Arrays.asList(findClassesInDumbMode(qualifiedName, scope)); } - List finders = finders(); + List finders = filteredFinders(); Condition classesFilter = getFilterFromFinders(scope, finders); List result = null; @@ -198,11 +198,6 @@ public class JavaPsiFacadeImpl extends JavaPsiFacadeEx { return dumbService.isDumb() && dumbService.isAlternativeResolveEnabled(); } - @NotNull - private List finders() { - return PsiElementFinder.EP.getPoint(myProject).getExtensionList(); - } - @Override @NotNull public PsiConstantEvaluationHelper getConstantEvaluationHelper() { @@ -242,7 +237,7 @@ public class JavaPsiFacadeImpl extends JavaPsiFacadeEx { @NotNull private List filteredFinders() { - return DumbService.getInstance(getProject()).filterByDumbAwareness(finders()); + return DumbService.getInstance(getProject()).filterByDumbAwareness(PsiElementFinder.EP.getPoint(myProject).getExtensionList()); } @Override