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 field/constant: fix array initializer (IDEA-135785)

Browse Source
This commit is contained in:
Anna Kozlova
2018-05-24 11:26:56 +03:00
parent 85396a14ec
commit e5483825a7
8 changed files with 60 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java
+1 -2
View File
@@ -27,7 +27,6 @@ import com.intellij.ide.util.DirectoryChooserUtil;
import com.intellij.ide.util.PackageUtil;
import com.intellij.ide.util.PsiClassListCellRenderer;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.Result;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Editor;
@@ -708,7 +707,7 @@ public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase
}
final SmartTypePointer type = SmartTypePointerManager.getInstance(myProject).createSmartTypePointer(myType);
initializer = IntroduceVariableBase.simplifyVariableInitializer(initializer, myType);
initializer = IntroduceVariableBase.simplifyVariableInitializer(initializer, myType, initializerPlace == InitializationPlace.IN_FIELD_DECLARATION);
final PsiMethod enclosingConstructor = getEnclosingConstructor(myParentClass, myAnchorElement);
PsiClass destClass = mySettings.getDestinationClass() == null ? myParentClass : mySettings.getDestinationClass();
java/java-impl/src/com/intellij/refactoring/introduceField/ElementToWorkOn.java
+20
View File
@@ -53,6 +53,23 @@ public class ElementToWorkOn {
myLocalVariable = localVariable;
myExpression = expr;
}
public static ElementToWorkOn adjustElements(PsiExpression expr, PsiElement anchorElement) {
PsiLocalVariable localVariable = null;
if (anchorElement instanceof PsiLocalVariable) {
localVariable = (PsiLocalVariable)anchorElement;
}
else if (expr instanceof PsiReferenceExpression) {
PsiElement ref = ((PsiReferenceExpression)expr).resolve();
if (ref instanceof PsiLocalVariable) {
localVariable = (PsiLocalVariable)ref;
}
}
else if (expr instanceof PsiArrayInitializerExpression && expr.getParent() instanceof PsiNewExpression) {
expr = (PsiExpression)expr.getParent();
}
return new ElementToWorkOn(localVariable, expr);
}
public PsiExpression getExpression() {
return myExpression;
@@ -156,6 +173,9 @@ public class ElementToWorkOn {
localVar = PsiTreeUtil.getParentOfType(ident, PsiLocalVariable.class);
}
}
else if (expr instanceof PsiArrayInitializerExpression && expr.getParent() instanceof PsiNewExpression) {
expr = (PsiExpression)expr.getParent();
}
}
if (expr == null && localVar == null) {
java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantHandler.java
+3 -10
View File
@@ -101,16 +101,9 @@ public class IntroduceConstantHandler extends BaseExpressionToFieldHandler {
PsiElement anchorElementIfAll) {
final PsiMethod containingMethod = PsiTreeUtil.getParentOfType(expr != null ? expr : anchorElement, PsiMethod.class);
PsiLocalVariable localVariable = null;
if (expr instanceof PsiReferenceExpression) {
PsiElement ref = ((PsiReferenceExpression)expr).resolve();
if (ref instanceof PsiLocalVariable) {
localVariable = (PsiLocalVariable)ref;
}
}
else if (anchorElement instanceof PsiLocalVariable) {
localVariable = (PsiLocalVariable)anchorElement;
}
ElementToWorkOn elementToWorkOn = ElementToWorkOn.adjustElements(expr, anchorElement);
PsiLocalVariable localVariable = elementToWorkOn.getLocalVariable();
expr = elementToWorkOn.getExpression();
String enteredName = null;
boolean replaceAllOccurrences = true;
java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceFieldHandler.java
+3 -10
View File
@@ -74,16 +74,9 @@ public class IntroduceFieldHandler extends BaseExpressionToFieldHandler {
PsiExpression[] occurrences, PsiElement anchorElement, PsiElement anchorElementIfAll) {
final AbstractInplaceIntroducer activeIntroducer = AbstractInplaceIntroducer.getActiveIntroducer(editor);
PsiLocalVariable localVariable = null;
if (anchorElement instanceof PsiLocalVariable) {
localVariable = (PsiLocalVariable)anchorElement;
}
else if (expr instanceof PsiReferenceExpression) {
PsiElement ref = ((PsiReferenceExpression)expr).resolve();
if (ref instanceof PsiLocalVariable) {
localVariable = (PsiLocalVariable)ref;
}
}
ElementToWorkOn elementToWorkOn = ElementToWorkOn.adjustElements(expr, anchorElement);
PsiLocalVariable localVariable = elementToWorkOn.getLocalVariable();
expr = elementToWorkOn.getExpression();
String enteredName = null;
boolean replaceAll = false;
java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java
+10 -2
View File
@@ -1040,7 +1040,13 @@ public abstract class IntroduceVariableBase extends IntroduceHandlerBase {
}
public static PsiExpression simplifyVariableInitializer(final PsiExpression initializer,
final PsiType expectedType) {
final PsiType expectedType) {
return simplifyVariableInitializer(initializer, expectedType, true);
}
public static PsiExpression simplifyVariableInitializer(final PsiExpression initializer,
final PsiType expectedType,
final boolean inDeclaration) {
if (initializer instanceof PsiTypeCastExpression) {
PsiExpression operand = ((PsiTypeCastExpression)initializer).getOperand();
@@ -1054,7 +1060,9 @@ public abstract class IntroduceVariableBase extends IntroduceHandlerBase {
else if (initializer instanceof PsiNewExpression) {
final PsiNewExpression newExpression = (PsiNewExpression)initializer;
if (newExpression.getArrayInitializer() != null) {
return newExpression.getArrayInitializer();
if (inDeclaration) {
return newExpression.getArrayInitializer();
}
}
else {
final PsiExpression tryToDetectDiamondNewExpr = ((PsiVariable)JavaPsiFacade.getElementFactory(initializer.getProject())
java/java-tests/testData/refactoring/inplaceIntroduceField/arrayInitializer.java
+5
View File
@@ -0,0 +1,5 @@
class Test {
{
String[] str = new String[] {"a"<caret>, "b", "c"};
}
}
java/java-tests/testData/refactoring/inplaceIntroduceField/arrayInitializer_after.java
+9
View File
@@ -0,0 +1,9 @@
class Test {
private String[] str;
{
this.str = new String[]{"a", "b", "c"};
String[] str = this.str;
}
}
java/java-tests/testSrc/com/intellij/java/refactoring/InplaceIntroduceFieldTest.java
+9
View File
@@ -37,6 +37,15 @@ public class InplaceIntroduceFieldTest extends AbstractJavaInplaceIntroduceTest
});
}
public void testArrayInitializer() {
doTest(new Pass<AbstractInplaceIntroducer>() {
@Override
public void pass(AbstractInplaceIntroducer inplaceIntroduceFieldPopup) {
}
});
}
public void testAnchor1() {
doTest(new Pass<AbstractInplaceIntroducer>() {