diff options
Diffstat (limited to 'platform/indexing-impl/src/com/intellij')
3 files changed, 11 insertions, 7 deletions
diff --git a/platform/indexing-impl/src/com/intellij/openapi/module/impl/scopes/ModuleWithDependentsScope.java b/platform/indexing-impl/src/com/intellij/openapi/module/impl/scopes/ModuleWithDependentsScope.java index 259ea3936934..c773402b27e3 100644 --- a/platform/indexing-impl/src/com/intellij/openapi/module/impl/scopes/ModuleWithDependentsScope.java +++ b/platform/indexing-impl/src/com/intellij/openapi/module/impl/scopes/ModuleWithDependentsScope.java @@ -56,6 +56,8 @@ class ModuleWithDependentsScope extends GlobalSearchScope { private static Set<Module> buildDependents(Module module) { Set<Module> result = new THashSet<Module>(); result.add(module); + + Set<Module> processedExporting = new THashSet<Module>(); ModuleIndex index = getModuleIndex(module.getProject()); @@ -64,9 +66,11 @@ class ModuleWithDependentsScope extends GlobalSearchScope { while (!walkingQueue.isEmpty()) { Module current = walkingQueue.pullFirst(); + processedExporting.add(current); result.addAll(index.plainUsages.get(current)); for (Module dependent : index.exportingUsages.get(current)) { - if (result.add(dependent)) { + result.add(dependent); + if (processedExporting.add(dependent)) { walkingQueue.addLast(dependent); } } diff --git a/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/id/IdTableBuilding.java b/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/id/IdTableBuilding.java index 3e6571405a91..8519453e3e6c 100644 --- a/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/id/IdTableBuilding.java +++ b/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/id/IdTableBuilding.java @@ -149,7 +149,9 @@ public class IdTableBuilding { } private int convertToMask(final WordOccurrence.Kind kind) { - if (kind == null) return UsageSearchContext.ANY; + if (kind == null) { + return UsageSearchContext.ANY; + } if (kind == WordOccurrence.Kind.CODE) return UsageSearchContext.IN_CODE; if (kind == WordOccurrence.Kind.COMMENTS) return UsageSearchContext.IN_COMMENTS; if (kind == WordOccurrence.Kind.LITERALS) return UsageSearchContext.IN_STRINGS; diff --git a/platform/indexing-impl/src/com/intellij/psi/impl/file/impl/ResolveScopeManagerImpl.java b/platform/indexing-impl/src/com/intellij/psi/impl/file/impl/ResolveScopeManagerImpl.java index 6f904bae5d54..b89042b68257 100644 --- a/platform/indexing-impl/src/com/intellij/psi/impl/file/impl/ResolveScopeManagerImpl.java +++ b/platform/indexing-impl/src/com/intellij/psi/impl/file/impl/ResolveScopeManagerImpl.java @@ -76,7 +76,7 @@ public class ResolveScopeManagerImpl extends ResolveScopeManager { } - private GlobalSearchScope getDefaultResolveScope(@NotNull PsiFile psiFile, @NotNull final VirtualFile vFile) { + private GlobalSearchScope getResolveScopeFromProviders(@NotNull final VirtualFile vFile) { return myDefaultResolveScopesCache.get(vFile); } @@ -85,8 +85,6 @@ public class ResolveScopeManagerImpl extends ResolveScopeManager { Module module = projectFileIndex.getModuleForFile(vFile); if (module != null) { boolean includeTests = projectFileIndex.isInTestSourceContent(vFile); - // TODO: dmitrylomov: removed this line to see what fails. - //!(vFile.getFileType() == StdFileTypes.JAVA && projectFileIndex.isContentSourceFile(vFile)); return GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(module, includeTests); } else { @@ -167,7 +165,7 @@ public class ResolveScopeManagerImpl extends ResolveScopeManager { return GlobalSearchScope.allScope(myProject); } - return getDefaultResolveScope(contextFile, vFile); + return getResolveScopeFromProviders(vFile); } @@ -175,7 +173,7 @@ public class ResolveScopeManagerImpl extends ResolveScopeManager { public GlobalSearchScope getDefaultResolveScope(final VirtualFile vFile) { final PsiFile psiFile = myManager.findFile(vFile); assert psiFile != null; - return getDefaultResolveScope(psiFile, vFile); + return getResolveScopeFromProviders(vFile); } |