From 21c9c77e5935cfcd21c1c048bcd22a07aabc136f Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 8 Dec 2009 21:08:13 +0300 Subject: [PATCH] correct scope for Python goto class and goto symbol contributors (PY-242) --- python/src/com/jetbrains/python/PyGotoClassContributor.java | 5 ++++- python/src/com/jetbrains/python/PyGotoSymbolContributor.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/python/src/com/jetbrains/python/PyGotoClassContributor.java b/python/src/com/jetbrains/python/PyGotoClassContributor.java index 88d480356f4a..d7b2538226b1 100644 --- a/python/src/com/jetbrains/python/PyGotoClassContributor.java +++ b/python/src/com/jetbrains/python/PyGotoClassContributor.java @@ -4,6 +4,7 @@ import com.intellij.navigation.ChooseByNameContributor; import com.intellij.navigation.NavigationItem; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; +import com.intellij.psi.search.ProjectScope; import com.intellij.psi.stubs.StubIndex; import com.intellij.util.ArrayUtil; import com.jetbrains.python.psi.PyClass; @@ -21,7 +22,9 @@ public class PyGotoClassContributor implements ChooseByNameContributor { } public NavigationItem[] getItemsByName(final String name, final String pattern, final Project project, final boolean includeNonProjectItems) { - final GlobalSearchScope scope = includeNonProjectItems ? null : GlobalSearchScope.projectScope(project); + final GlobalSearchScope scope = includeNonProjectItems + ? ProjectScope.getAllScope(project) + : GlobalSearchScope.projectScope(project); final Collection classes = StubIndex.getInstance().get(PyClassNameIndex.KEY, name, project, scope); return classes.toArray(new NavigationItem[classes.size()]); } diff --git a/python/src/com/jetbrains/python/PyGotoSymbolContributor.java b/python/src/com/jetbrains/python/PyGotoSymbolContributor.java index 7f929df96b75..196a41d534c5 100644 --- a/python/src/com/jetbrains/python/PyGotoSymbolContributor.java +++ b/python/src/com/jetbrains/python/PyGotoSymbolContributor.java @@ -4,6 +4,7 @@ import com.intellij.navigation.ChooseByNameContributor; import com.intellij.navigation.NavigationItem; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; +import com.intellij.psi.search.ProjectScope; import com.intellij.psi.stubs.StubIndex; import com.intellij.util.ArrayUtil; import com.jetbrains.python.psi.stubs.PyClassNameIndex; @@ -26,7 +27,9 @@ public class PyGotoSymbolContributor implements ChooseByNameContributor { } public NavigationItem[] getItemsByName(final String name, final String pattern, final Project project, final boolean includeNonProjectItems) { - final GlobalSearchScope scope = includeNonProjectItems ? null : GlobalSearchScope.projectScope(project); + final GlobalSearchScope scope = includeNonProjectItems + ? ProjectScope.getAllScope(project) + : GlobalSearchScope.projectScope(project); List symbols = new ArrayList(); symbols.addAll(StubIndex.getInstance().get(PyClassNameIndex.KEY, name, project, scope));