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

IDEA-167532 skip duplicated jars in retrieving of language level for files under a library source root

Browse Source
This commit is contained in:
Ivan Bessonov
2017-03-23 17:43:52 +03:00
parent 740e1366b6
commit 2f5f6392a2
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/JavaPsiImplementationHelperImpl.java
+8 -7
View File
@@ -49,9 +49,7 @@ import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.List;
import java.util.Properties;
import java.util.Set;
import java.util.*;
/**
* @author yole
@@ -170,12 +168,15 @@ public class JavaPsiImplementationHelperImpl extends JavaPsiImplementationHelper
return null;
}
String className = virtualFile.getNameWithoutExtension();
Set<VirtualFile> visitedRoots = ContainerUtil.newHashSet();
for (OrderEntry entry : index.getOrderEntriesForFile(virtualFile)) {
for (VirtualFile rootFile : entry.getFiles(OrderRootType.CLASSES)) {
VirtualFile classFile = rootFile.findFileByRelativePath(relativePath);
PsiJavaFile javaFile = classFile == null ? null : getPsiFileInRoot(classFile, className);
if (javaFile != null) {
return javaFile.getLanguageLevel();
if (visitedRoots.add(rootFile)) {
VirtualFile classFile = rootFile.findFileByRelativePath(relativePath);
PsiJavaFile javaFile = classFile == null ? null : getPsiFileInRoot(classFile, className);
if (javaFile != null) {
return javaFile.getLanguageLevel();
}
}
}
}