MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

introduce var/field: warn if the only expr in scope is anonymous class

Browse Source
This commit is contained in:
Anna Kozlova
2014-12-05 19:21:43 +01:00
parent ed02e2eed8
commit edd8518db4
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/introduceField/ElementToWorkOn.java
+1 -1
View File
@@ -111,7 +111,7 @@ public class ElementToWorkOn {
if (expressions.isEmpty()) {
editor.getSelectionModel().selectLineAtCaret();
}
else if (expressions.size() == 1) {
else if (!IntroduceVariableBase.isChooserNeeded(expressions)) {
expr = expressions.get(0);
}
else {
java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java
+9 -2
View File
@@ -73,7 +73,6 @@ import com.intellij.util.containers.MultiMap;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import java.util.*;
@@ -125,7 +124,7 @@ public abstract class IntroduceVariableBase extends IntroduceHandlerBase {
final List<PsiExpression> expressions = collectExpressions(file, editor, offset);
if (expressions.isEmpty()) {
selectionModel.selectLineAtCaret();
} else if (expressions.size() == 1) {
} else if (!isChooserNeeded(expressions)) {
final TextRange textRange = expressions.get(0).getTextRange();
selectionModel.setSelection(textRange.getStartOffset(), textRange.getEndOffset());
}
@@ -147,6 +146,14 @@ public abstract class IntroduceVariableBase extends IntroduceHandlerBase {
}
}
public static boolean isChooserNeeded(List<PsiExpression> exprs) {
if (exprs.size() == 1) {
final PsiExpression expression = exprs.get(0);
return expression instanceof PsiNewExpression && ((PsiNewExpression)expression).getAnonymousClass() != null;
}
return true;
}
public static boolean selectLineAtCaret(int offset, PsiElement[] statementsInRange) {
return !PsiUtil.isStatement(statementsInRange[0]) ||
statementsInRange[0].getTextRange().getStartOffset() > offset ||