From b2571aab34934f355abcaaa0b7fb69d1914768d8 Mon Sep 17 00:00:00 2001 From: "Gregory.Shrago" Date: Sat, 29 Dec 2012 17:45:59 +0400 Subject: [PATCH] EA-42422 - NPE: TemporaryPlacesRegistry$.addInjectionInPlace --- .../plugins/intelliLang/inject/InjectLanguageAction.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/InjectLanguageAction.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/InjectLanguageAction.java index cc102df4ed47..2f7059153f37 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/InjectLanguageAction.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/InjectLanguageAction.java @@ -96,7 +96,8 @@ public class InjectLanguageAction implements IntentionAction { final PsiLanguageInjectionHost host = findInjectionHost(editor, file); if (host == null) return; if (defaultFunctionalityWorked(host, languageId)) return; - final Language language = InjectedLanguage.findLanguageById(languageId); + Language language = InjectedLanguage.findLanguageById(languageId); + if (language == null) return; try { for (LanguageInjectionSupport support : InjectorUtils.getActiveInjectionSupports()) { if (support.addInjectionInPlace(language, host)) return;