From 7f02c67fbf5026eb17523b778ba580ae3c03d79d Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 2 Dec 2016 14:20:49 +0300 Subject: [PATCH] Avoid NPE while calculating assertion message (EA-92384 - NPE: KtElementImpl.getContainingKtFile) --- .../frontend/src/org/jetbrains/kotlin/psi/KtElementImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtElementImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtElementImpl.java index b4dd410f029..2b4a0659315 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtElementImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtElementImpl.java @@ -58,7 +58,7 @@ public class KtElementImpl extends ASTWrapperPsiElement implements KtElement { @Override public KtFile getContainingKtFile() { PsiFile file = getContainingFile(); - assert file instanceof KtFile : "KtElement not inside KtFile: " + file + " " + file.getText(); + assert file instanceof KtFile : "KtElement not inside KtFile: " + file + (file == null ? "" : " " + file.getText()); return (KtFile) file; }