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

search for first class file in all roots to detect language level

Browse Source
This commit is contained in:
Anna Kozlova
2012-05-31 21:30:09 +04:00
parent f93626217d
commit d1cf24b6e7
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/JavaPsiImplementationHelperImpl.java
+9 -6
View File
@@ -142,24 +142,27 @@ public class JavaPsiImplementationHelperImpl extends JavaPsiImplementationHelper
for (VirtualFile rootFile : files) {
final VirtualFile classFile = rootFile.findFileByRelativePath(relativePath);
if (classFile != null) {
return getLanguageLevel(classFile);
final PsiJavaFile javaFile = getPsiFileInRoot(classFile);
if (javaFile != null) {
return javaFile.getLanguageLevel();
}
}
}
return LanguageLevelProjectExtension.getInstance(myProject).getLanguageLevel();
}
return null;
}
private LanguageLevel getLanguageLevel(final VirtualFile dirFile) {
@Nullable
private PsiJavaFile getPsiFileInRoot(final VirtualFile dirFile) {
final VirtualFile[] children = dirFile.getChildren();
final LanguageLevel defaultLanguageLevel = LanguageLevelProjectExtension.getInstance(myProject).getLanguageLevel();
for (VirtualFile child : children) {
if (StdFileTypes.CLASS.equals(child.getFileType())) {
final PsiFile psiFile = PsiManager.getInstance(myProject).findFile(child);
if (psiFile instanceof PsiJavaFile) return ((PsiJavaFile)psiFile).getLanguageLevel();
if (psiFile instanceof PsiJavaFile) return ((PsiJavaFile)psiFile);
}
}
return defaultLanguageLevel;
return null;
}
@Override