From c910fe805e54d3b89a5110b792883ad7ec4c00b5 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Mon, 5 Oct 2009 16:15:05 +0400 Subject: [PATCH] NPE --- .../daemon/impl/quickfix/BringVariableIntoScopeFix.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/BringVariableIntoScopeFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/BringVariableIntoScopeFix.java index 689450880243..08bb263ce931 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/BringVariableIntoScopeFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/BringVariableIntoScopeFix.java @@ -32,8 +32,9 @@ public class BringVariableIntoScopeFix implements IntentionAction { @NotNull public String getText() { - LOG.assertTrue(myOutOfScopeVariable != null); - String varText = PsiFormatUtil.formatVariable(myOutOfScopeVariable, PsiFormatUtil.SHOW_NAME | PsiFormatUtil.SHOW_TYPE, PsiSubstitutor.EMPTY); + PsiLocalVariable variable = myOutOfScopeVariable; + + String varText = variable == null ? "" : PsiFormatUtil.formatVariable(variable, PsiFormatUtil.SHOW_NAME | PsiFormatUtil.SHOW_TYPE, PsiSubstitutor.EMPTY); return QuickFixBundle.message("bring.variable.to.scope.text", varText); }