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

remove usages of FileBasedIndex#findFileById from compiler reference index code

Browse Source 
GitOrigin-RevId: b988b639a627a0ff7560743851ca9ae0ed397bd5
This commit is contained in:
Dmitry Batkovich
2019-10-24 14:08:59 +00:00
committed by intellij-monorepo-bot
parent af895ef068
commit 165dbfff4e
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceServiceBase.java
+3 -3
View File
@@ -26,6 +26,7 @@ import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.ModificationTracker;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.VirtualFileWithId;
import com.intellij.openapi.vfs.newvfs.ManagingFS;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
@@ -37,7 +38,6 @@ import com.intellij.psi.util.CachedValuesManager;
import com.intellij.psi.util.PsiModificationTracker;
import com.intellij.psi.util.PsiUtilCore;
import com.intellij.util.containers.ConcurrentFactoryMap;
import com.intellij.util.indexing.FileBasedIndex;
import com.intellij.util.indexing.StorageException;
import com.intellij.util.messages.MessageBusConnection;
import gnu.trove.THashSet;
@@ -537,12 +537,12 @@ public abstract class CompilerReferenceServiceBase<Reader extends CompilerRefere
@TestOnly
@Nullable
public Set<VirtualFile> getReferentFiles(@NotNull PsiElement element) {
FileBasedIndex fileIndex = FileBasedIndex.getInstance();
ManagingFS managingFS = ManagingFS.getInstance();
final TIntHashSet ids = getReferentFileIds(element);
if (ids == null) return null;
Set<VirtualFile> fileSet = new THashSet<>();
ids.forEach(id -> {
final VirtualFile vFile = fileIndex.findFileById(myProject, id);
final VirtualFile vFile = managingFS.findFileById(id);
assert vFile != null;
fileSet.add(vFile);
return true;
java/compiler/impl/src/com/intellij/compiler/backwardRefs/view/CompilerReferenceFindUsagesTestInfo.java
+3 -2
View File
@@ -18,6 +18,7 @@ package com.intellij.compiler.backwardRefs.view;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.newvfs.ManagingFS;
import com.intellij.util.indexing.FileBasedIndex;
import gnu.trove.TIntHashSet;
import org.jetbrains.annotations.NotNull;
@@ -42,9 +43,9 @@ public class CompilerReferenceFindUsagesTestInfo {
@NotNull
VirtualFile[] getFilesWithKnownOccurrences() {
if (myFileIds == null) throw new IllegalStateException();
final FileBasedIndex fileBasedIndex = FileBasedIndex.getInstance();
ManagingFS managingFS = ManagingFS.getInstance();
return IntStream.of(myFileIds.toArray())
.mapToObj(id -> fileBasedIndex.findFileById(myProject, id))
.mapToObj(managingFS::findFileById)
.filter(f -> !myDirtyScopeInfo.getDirtyScope().contains(f))
.toArray(VirtualFile[]::new);
}