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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anna Kozlova
2012-01-25 16:54:45 +04:00
parent 116a26defe 84f4b2b829
commit d1ec7e2e82
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/core/CoreJavaFileManager.java
+8 -3
View File
@@ -116,13 +116,18 @@ public class CoreJavaFileManager extends PackageIndex implements JavaFileManager
@Nullable
private PsiClass findClassInClasspathEntry(String qName, File file) {
String fileName = qName.replace(".", "/") + ".class";
// TODO handle inner classes correctly
String fileName = qName.replace(".", "/") + ".java";
VirtualFile classFile = findUnderClasspathEntry(file, fileName);
if (classFile == null) {
fileName = qName.replace(".", "/") + ".class";
classFile = findUnderClasspathEntry(file, fileName);
}
if (classFile != null) {
PsiFile psiFile = myPsiManager.findFile(classFile);
if (!(psiFile instanceof PsiJavaFile)) {
throw new UnsupportedOperationException("no java file for .class");
throw new UnsupportedOperationException("no java file for " + fileName);
}
final PsiClass[] classes = ((PsiJavaFile)psiFile).getClasses();
if (classes.length == 1) {