From 640dd855640556a754e2a2e3210b9b4c53fc8f86 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Wed, 22 Aug 2012 19:00:09 +0400 Subject: [PATCH] introduce from vararg selection: erase type before array creation --- .../introduceVariable/IntroduceVariableBase.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java b/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java index 7617f51e4e85..640d596aaffc 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java @@ -53,10 +53,7 @@ import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; import com.intellij.psi.impl.source.tree.java.ReplaceExpressionUtil; import com.intellij.psi.scope.processor.VariablesProcessor; import com.intellij.psi.scope.util.PsiScopesUtil; -import com.intellij.psi.util.PsiExpressionTrimRenderer; -import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.psi.util.PsiUtil; -import com.intellij.psi.util.PsiUtilBase; +import com.intellij.psi.util.*; import com.intellij.refactoring.*; import com.intellij.refactoring.introduce.inplace.AbstractInplaceIntroducer; import com.intellij.refactoring.introduce.inplace.OccurrencesChooser; @@ -458,7 +455,7 @@ public abstract class IntroduceVariableBase extends IntroduceHandlerBase { } if (endElement == null || endOffset < endElement.getTextRange().getEndOffset()) return null; - final PsiType componentType = psiSubstitutor.substitute(psiType.getComponentType()); + final PsiType componentType = TypeConversionUtil.erasure(psiSubstitutor.substitute(psiType.getComponentType())); try { final PsiExpression expressionFromText = elementFactory.createExpressionFromText("new " + componentType.getCanonicalText() + "[]{" + text + "}", parent);