From fe0429c665165a9b6fdf8042ae32de1a1d24d955 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Fri, 27 Jan 2012 17:08:16 +0400 Subject: [PATCH] show expression chooser even if there is no tailing ; --- .../introduceVariable/IntroduceVariableBase.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 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 818fb9b5d337..dfa8c7417307 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java @@ -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())) {