From 8ce7f4e0ebe36b5f3aca6586fca3fddf308e8e65 Mon Sep 17 00:00:00 2001 From: "Gregory.Shrago" Date: Wed, 23 Jul 2014 14:18:17 +0400 Subject: [PATCH] handle null containing files gracefully --- .../intellij/plugins/intelliLang/inject/InjectorUtils.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/InjectorUtils.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/InjectorUtils.java index 48ee3b51fac2..96f29f253e4e 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/InjectorUtils.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/InjectorUtils.java @@ -226,7 +226,7 @@ public class InjectorUtils { } @Nullable - public static BaseInjection findCommentInjection(PsiElement context, final String supportId, final Ref causeRef) { + public static BaseInjection findCommentInjection(@NotNull PsiElement context, @NotNull String supportId, @Nullable Ref causeRef) { PsiElement target = CompletionUtil.getOriginalOrSelf(context); PsiFile file = target.getContainingFile(); TreeMap map = getInjectionMap(file); @@ -273,7 +273,9 @@ public class InjectorUtils { e instanceof PsiLanguageInjectionHost && StringUtil.isEmptyOrSpaces(e.getText()); } - protected static TreeMap getInjectionMap(final PsiFile file) { + @Nullable + private static TreeMap getInjectionMap(@Nullable final PsiFile file) { + if (file == null) return null; // e.g. null for synthetic groovy variables return CachedValuesManager.getCachedValue(file, new CachedValueProvider>() { @Nullable @Override