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

fix NPE in case context element has no containing file

Browse Source
This commit is contained in:
Maxim.Mossienko
2012-03-19 15:39:27 +04:00
parent 9c506be58a
commit ce4dbbf82d
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/psi/impl/source/DummyHolder.java
+3 -1
View File
@@ -52,8 +52,10 @@ public class DummyHolder extends PsiFileImpl {
protected static Language language(PsiElement context, Language defaultLanguage) {
if (context == null) return defaultLanguage;
PsiFile file = context.getContainingFile();
if (file == null) return defaultLanguage;
Language contextLanguage = context.getLanguage();
Language language = context.getContainingFile().getLanguage();
Language language = file.getLanguage();
if (language.isKindOf(contextLanguage)) return language;
return contextLanguage;
}