show expression chooser even if there is no tailing ;
authorAnna Kozlova <anna.kozlova@jetbrains.com>
Fri, 27 Jan 2012 13:08:16 +0000 (17:08 +0400)
committerAnna Kozlova <anna.kozlova@jetbrains.com>
Fri, 27 Jan 2012 13:24:22 +0000 (17:24 +0400)
java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java

index 818fb9b5d33720476c3031a44b10c0899d56b55f..dfa8c7417307f7ed495810c2eb6a89772aa93edf 100644 (file)
@@ -47,7 +47,10 @@ import com.intellij.psi.codeStyle.*;
 import com.intellij.psi.impl.PsiDiamondTypeUtil;
 import com.intellij.psi.impl.source.resolve.DefaultParameterTypeInferencePolicy;
 import com.intellij.psi.impl.source.tree.java.ReplaceExpressionUtil;
-import com.intellij.psi.util.*;
+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.refactoring.*;
 import com.intellij.refactoring.introduce.inplace.AbstractInplaceIntroducer;
 import com.intellij.refactoring.introduce.inplace.OccurrencesChooser;
@@ -100,8 +103,7 @@ public abstract class IntroduceVariableBase extends IntroduceHandlerBase {
       final PsiElement[] statementsInRange = findStatementsAtOffset(editor, file, offset);
 
       //try line selection
-      if (statementsInRange.length == 1 && (PsiUtilCore.hasErrorElementChild(statementsInRange[0]) ||
-                                            !PsiUtil.isStatement(statementsInRange[0]) ||
+      if (statementsInRange.length == 1 && (!PsiUtil.isStatement(statementsInRange[0]) ||
                                             statementsInRange[0].getTextRange().getStartOffset() > offset ||
                                             statementsInRange[0].getTextRange().getEndOffset() < offset ||
                                             isPreferStatements())) {