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

IJPL-930 Improve LibraryScopeCache

Browse Source 
GitOrigin-RevId: 67eb82b8cc8d90d201d04cd1a00ac2e5662131b8
This commit is contained in:
Ilya Korennoy
2026-02-06 16:05:51 +00:00
committed by intellij-monorepo-bot
parent 5d0a1426f5
commit 27a3789b65
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/analysis-impl/src/com/intellij/openapi/roots/impl/LibraryScopeCache.java
+6 -11
View File
@@ -158,15 +158,13 @@ public final class LibraryScopeCache {
var libraries = index.findContainingLibraries(virtualFile);
var currentSnapshot = WorkspaceModel.getInstance(myProject).getCurrentSnapshot();
LibraryEntity lib = null;
List<Module> modulesLibraryUsedIn = new ArrayList<>();
var exportedDependentsGraph = ModuleExportedDependenciesGraph.getInstance(myProject).exportedDependentsGraph();
for (var library: libraries) {
lib = library;
modulesLibraryUsedIn.addAll(findModulesWithLibraryId(library.getSymbolicId(), currentSnapshot, exportedDependentsGraph));
}
LibraryEntity lib = ContainerUtil.getFirstItem(libraries);
if (lib != null) {
var roots = lib.getRoots().stream()
.map(LibraryRoot::getUrl)
@@ -340,18 +338,15 @@ public final class LibraryScopeCache {
private void addModulesInheritingProjectSdk(SdkId sdkId, ImmutableEntityStorage currentSnapshot, Set<Module> result) {
var projectSdk = ProjectRootManager.getInstance(myProject).getProjectSdk();
if (projectSdk == null || !projectSdk.getName().equals(sdkId.getName())) {
if (projectSdk == null || (!projectSdk.getName().equals(sdkId.getName()) && !projectSdk.getSdkType().getName().equals(sdkId.getType()))) {
return;
}
for (var moduleEntity : SequencesKt.toList(currentSnapshot.entities(ModuleEntity.class))) {
for (var dep : moduleEntity.getDependencies()) {
if (dep instanceof InheritedSdkDependency) {
var moduleBridge = ModuleBridges.findModule(moduleEntity, currentSnapshot);
if (moduleBridge != null) {
result.add(moduleBridge);
}
break;
if (ContainerUtil.exists(moduleEntity.getDependencies(), dep -> dep instanceof InheritedSdkDependency)) {
var moduleBridge = ModuleBridges.findModule(moduleEntity, currentSnapshot);
if (moduleBridge != null) {
result.add(moduleBridge);
}
}
}