diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/variable/GrInplaceVariableIntroducer.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/variable/GrInplaceVariableIntroducer.java index a8732988a2c8..cc1c7030c828 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/variable/GrInplaceVariableIntroducer.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/variable/GrInplaceVariableIntroducer.java @@ -164,8 +164,10 @@ public abstract class GrInplaceVariableIntroducer extends GrAbstractInplaceIntro @Override protected void addAdditionalVariables(TemplateBuilderImpl builder) { GrVariable variable = getVariable(); - assert variable != null; - TypeConstraint[] constraints = {SupertypeConstraint.create(variable.getInitializerGroovy().getType())}; + assert variable != null && variable.getInitializerGroovy() != null; + final PsiType initializerType = variable.getInitializerGroovy().getType(); + TypeConstraint[] constraints = initializerType != null ? new SupertypeConstraint[]{SupertypeConstraint.create(initializerType)} + : TypeConstraint.EMPTY_ARRAY; ChooseTypeExpression typeExpression = new ChooseTypeExpression(constraints, variable.getManager(), variable.getResolveScope(), true, GroovyApplicationSettings.getInstance().INTRODUCE_LOCAL_SELECT_DEF); PsiElement element = variable.getTypeElementGroovy() != null ? variable.getTypeElementGroovy() : PsiUtil.findModifierInList(variable.getModifierList(), GrModifier.DEF);