MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

javac ast indices: do not hide find usages in libraries

Browse Source
This commit is contained in:
Dmitry Batkovich
2016-10-27 16:31:42 +03:00
parent 027df2e7c9
commit 02bb17ad2b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceServiceImpl.java
+5 -3
View File
@@ -242,7 +242,7 @@ public class CompilerReferenceServiceImpl extends CompilerReferenceService imple
TIntHashSet referentFileIds = getReferentFileIds(element);
if (referentFileIds == null) return null;
return getScopeRestrictedByFileTypes(new ScopeWithoutReferencesOnCompilation(referentFileIds).intersectWith(notScope(myDirtyModulesHolder.getDirtyScope())),
return getScopeRestrictedByFileTypes(new ScopeWithoutReferencesOnCompilation(referentFileIds, myProjectFileIndex).intersectWith(notScope(myDirtyModulesHolder.getDirtyScope())),
myFileTypes.toArray(new FileType[myFileTypes.size()]));
}
@@ -384,14 +384,16 @@ public class CompilerReferenceServiceImpl extends CompilerReferenceService imple
private static class ScopeWithoutReferencesOnCompilation extends GlobalSearchScope {
private final TIntHashSet myReferentIds;
private final ProjectFileIndex myIndex;
private ScopeWithoutReferencesOnCompilation(TIntHashSet ids) {
private ScopeWithoutReferencesOnCompilation(TIntHashSet ids, ProjectFileIndex index) {
myReferentIds = ids;
myIndex = index;
}
@Override
public boolean contains(@NotNull VirtualFile file) {
return !(file instanceof VirtualFileWithId) || !myReferentIds.contains(((VirtualFileWithId)file).getId());
return file instanceof VirtualFileWithId && myIndex.isInSourceContent(file) && !myReferentIds.contains(((VirtualFileWithId)file).getId());
}
@Override