introduce parameter on non-expressive line ( IDEA-26367 )

This commit is contained in:
anna
2010-04-26 17:56:48 +04:00
parent 3c0c433a11
commit 7a9cd52296
@@ -79,9 +79,16 @@ public class ElementToWorkOn {
final int offset = editor.getCaretModel().getOffset();
final PsiElement[] statementsInRange = IntroduceVariableBase.findStatementsAtOffset(editor, file, offset);
if (statementsInRange.length == 1 && PsiUtil.hasErrorElementChild(statementsInRange[0])) {
editor.getSelectionModel().selectLineAtCaret();
} else {
final ElementToWorkOn elementToWorkOn = getElementToWorkOn(editor, file, refactoringName, helpId, project, localVar, expr);
if (elementToWorkOn == null || elementToWorkOn.getLocalVariable() == null && elementToWorkOn.getExpression() == null) {
editor.getSelectionModel().removeSelection();
}
}
if (!editor.getSelectionModel().hasSelection()){
final List<PsiExpression> expressions = IntroduceVariableBase.collectExpressions(file, editor, offset, statementsInRange);
if (expressions.isEmpty()) {
editor.getSelectionModel().selectLineAtCaret();