From 165dbfff4ecd255c982faae5fc8574dda79be58b Mon Sep 17 00:00:00 2001
From: Dmitry Batkovich <dmitry.batkovich@jetbrains.com>
Date: Thu, 24 Oct 2019 08:45:29 +0200
Subject: [PATCH] remove usages of FileBasedIndex#findFileById from compiler
 reference index code

GitOrigin-RevId: b988b639a627a0ff7560743851ca9ae0ed397bd5
---
 .../compiler/backwardRefs/CompilerReferenceServiceBase.java | 6 +++---
 .../view/CompilerReferenceFindUsagesTestInfo.java           | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceServiceBase.java b/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceServiceBase.java
index ccc38ba56fbc..c06fd860ffd4 100644
--- a/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceServiceBase.java
+++ b/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceServiceBase.java
@@ -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;
diff --git a/java/compiler/impl/src/com/intellij/compiler/backwardRefs/view/CompilerReferenceFindUsagesTestInfo.java b/java/compiler/impl/src/com/intellij/compiler/backwardRefs/view/CompilerReferenceFindUsagesTestInfo.java
index 4712bdcc1576..d24c3b73ad4b 100644
--- a/java/compiler/impl/src/com/intellij/compiler/backwardRefs/view/CompilerReferenceFindUsagesTestInfo.java
+++ b/java/compiler/impl/src/com/intellij/compiler/backwardRefs/view/CompilerReferenceFindUsagesTestInfo.java
@@ -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);
   }