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

[java] allows automatic modules to the upgrade path (IDEA-189693)

Browse Source
This commit is contained in:
Roman Shevchenko
2018-07-26 16:04:55 +02:00
parent 346766bce4
commit 659a78b4bf
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-indexing-impl/src/com/intellij/psi/impl/file/impl/JavaFileManagerImpl.java
+4 -11
View File
@@ -30,7 +30,6 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.jps.model.java.JavaModuleSourceRootTypes;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import static java.util.Objects.requireNonNull;
@@ -178,20 +177,14 @@ public class JavaFileManagerImpl implements JavaFileManager, Disposable {
public Collection<PsiJavaModule> findModules(@NotNull String moduleName, @NotNull GlobalSearchScope scope) {
GlobalSearchScope excludingScope = new LibSrcExcludingScope(scope);
Collection<PsiJavaModule> named = JavaModuleNameIndex.getInstance().get(moduleName, myManager.getProject(), excludingScope);
if (!named.isEmpty()) {
return upgradeModules(sortModules(named, scope), moduleName, scope);
}
List<PsiJavaModule> results = new ArrayList<>(JavaModuleNameIndex.getInstance().get(moduleName, myManager.getProject(), excludingScope));
Collection<VirtualFile> jars = JavaAutoModuleNameIndex.getFilesByKey(moduleName, excludingScope);
if (!jars.isEmpty()) {
List<PsiJavaModule> automatic = jars.stream().map(f -> LightJavaModule.getModule(myManager, f)).collect(Collectors.toList());
if (!automatic.isEmpty()) {
return sortModules(automatic, scope);
}
jars.stream().map(f -> LightJavaModule.getModule(myManager, f)).forEach(results::add);
}
return Collections.emptyList();
return upgradeModules(sortModules(results, scope), moduleName, scope);
}
private static class LibSrcExcludingScope extends DelegatingGlobalSearchScope {
@@ -229,7 +222,7 @@ public class JavaFileManagerImpl implements JavaFileManager, Disposable {
ModuleFileIndex index = ModuleRootManager.getInstance(module).getFileIndex();
for (ListIterator<PsiJavaModule> i = list.listIterator(); i.hasNext(); ) {
PsiJavaModule candidate = i.next();
if (index.getOrderEntryForFile(candidate.getContainingFile().getVirtualFile()) instanceof JdkOrderEntry) {
if (index.getOrderEntryForFile(PsiImplUtil.getModuleVirtualFile(candidate)) instanceof JdkOrderEntry) {
if (i.previousIndex() > 0) {
i.remove(); // not at the top -> is upgraded
}