diff options
author | Tor Norbye <tnorbye@google.com> | 2014-08-19 22:27:03 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-19 21:25:05 +0000 |
commit | 4ca751c002784c4bfd349cc5240b045b62277c80 (patch) | |
tree | dfc17b31990e2429535609b85f6d080c4fa0d9fe /platform/indexing-impl/src/com/intellij/psi/impl/file/impl/ResolveScopeManagerImpl.java | |
parent | 890d9a2952301682ffecaed4495f5f65c84c3642 (diff) | |
parent | 060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8 (diff) | |
download | idea-4ca751c002784c4bfd349cc5240b045b62277c80.tar.gz |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'platform/indexing-impl/src/com/intellij/psi/impl/file/impl/ResolveScopeManagerImpl.java')
-rw-r--r-- | platform/indexing-impl/src/com/intellij/psi/impl/file/impl/ResolveScopeManagerImpl.java | 8 |
1 files changed, 3 insertions, 5 deletions
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); } |