From ce4dbbf82dfbe482e12fb97c6124ee1b2a70f491 Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Mon, 19 Mar 2012 15:36:56 +0400 Subject: [PATCH] fix NPE in case context element has no containing file --- .../src/com/intellij/psi/impl/source/DummyHolder.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/DummyHolder.java b/platform/core-impl/src/com/intellij/psi/impl/source/DummyHolder.java index 1a1a5111c878..c12f291f9431 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/source/DummyHolder.java +++ b/platform/core-impl/src/com/intellij/psi/impl/source/DummyHolder.java @@ -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; }