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

[platform] Reduce uses of obsolete DirectoryIndex; WorkspaceFileIndexEx#getInstance

Browse Source 
GitOrigin-RevId: d966aa013eaa3ad63e407d917d7cd6dcb68ee883
This commit is contained in:
Tagir Valeev
2025-05-20 08:42:46 +00:00
committed by intellij-monorepo-bot
parent c556b1b564
commit 35a42d780f
11 changed files with 45 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-indexing-impl/src/com/intellij/openapi/roots/impl/ProjectPackageIndexImpl.java
+8 -7
View File
@@ -8,6 +8,7 @@ import com.intellij.openapi.util.NlsSafe;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.util.Query;
import com.intellij.workspaceModel.core.fileIndex.impl.WorkspaceFileIndexEx;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -16,32 +17,32 @@ import org.jetbrains.annotations.Nullable;
public final class ProjectPackageIndexImpl extends PackageIndex {
private static final Logger LOG = Logger.getInstance(ProjectPackageIndexImpl.class);
private final DirectoryIndex myDirectoryIndex;
private final WorkspaceFileIndexEx myWorkspaceFileIndex;
@ApiStatus.Internal
public ProjectPackageIndexImpl(@NotNull Project project) {
myDirectoryIndex = DirectoryIndex.getInstance(project);
myWorkspaceFileIndex = WorkspaceFileIndexEx.getInstance(project);
}
@Override
public Query<VirtualFile> getDirsByPackageName(@NotNull @NlsSafe String packageName,
@NotNull GlobalSearchScope scope) {
return myDirectoryIndex.getDirectoriesByPackageName(packageName, scope);
return myWorkspaceFileIndex.getDirectoriesByPackageName(packageName, scope);
}
@Override
public Query<VirtualFile> getFilesByPackageName(@NotNull String packageName) {
return myDirectoryIndex.getFilesByPackageName(packageName);
return myWorkspaceFileIndex.getFilesByPackageName(packageName);
}
@Override
public @NotNull Query<VirtualFile> getDirsByPackageName(@NotNull @NlsSafe String packageName, boolean includeLibrarySources) {
return myDirectoryIndex.getDirectoriesByPackageName(packageName, includeLibrarySources);
return myWorkspaceFileIndex.getDirectoriesByPackageName(packageName, includeLibrarySources);
}
@Override
public @Nullable String getPackageName(@NotNull VirtualFile fileOrDir) {
return myDirectoryIndex.getPackageName(fileOrDir);
return myWorkspaceFileIndex.getPackageName(fileOrDir);
}
@Override
@@ -49,6 +50,6 @@ public final class ProjectPackageIndexImpl extends PackageIndex {
if (!dir.isDirectory()) {
LOG.error(dir.getPresentableUrl() + " is not a directory");
}
return myDirectoryIndex.getPackageName(dir);
return myWorkspaceFileIndex.getPackageName(dir);
}
}