From 021ff89affb6fab30ef436ca62a0ef86f89e9b5a Mon Sep 17 00:00:00 2001 From: Danila Ponomarenko Date: Mon, 28 May 2012 14:54:21 +0400 Subject: [PATCH] IDEA-36326 "set" support added --- .../quickfix/ReplaceWithListAccessFix.java | 67 ++++++++++++++++--- .../afterSetStatement.java | 9 +++ .../beforeAssignmentInIfCondition.java | 11 +++ .../beforeSetStatement.java | 9 +++ 4 files changed, 88 insertions(+), 8 deletions(-) create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceWithListAccess/afterSetStatement.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceWithListAccess/beforeAssignmentInIfCondition.java create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceWithListAccess/beforeSetStatement.java diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceWithListAccessFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceWithListAccessFix.java index 900c111ceed0..4a73cb1daf69 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceWithListAccessFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceWithListAccessFix.java @@ -21,9 +21,11 @@ import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.psi.*; +import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.psi.util.TypeConversionUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * @author Danila Ponomarenko @@ -50,24 +52,36 @@ public class ReplaceWithListAccessFix implements IntentionAction { @Override public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) { if (!myArrayAccessExpression.isValid()) return false; - if (!TypeConversionUtil.areTypesAssignmentCompatible(PsiType.INT, myArrayAccessExpression.getIndexExpression())){ + if (!TypeConversionUtil.areTypesAssignmentCompatible(PsiType.INT, myArrayAccessExpression.getIndexExpression())) { return false; } + final PsiElement parent = myArrayAccessExpression.getParent(); + if (parent instanceof PsiAssignmentExpression) { + final PsiExpression lExpression = ((PsiAssignmentExpression)parent).getLExpression(); + if (lExpression.equals(myArrayAccessExpression) && !(parent.getParent() instanceof PsiExpressionStatement)) { + return false; + } + } final PsiExpression arrayExpression = myArrayAccessExpression.getArrayExpression(); final PsiType type = arrayExpression.getType(); + final PsiType listType = createUtilListType(project); - if (type == null) return false; + if (type == null || listType == null) return false; + + return listType.isAssignableFrom(type); + } + + @Nullable + private PsiType createUtilListType(@NotNull Project project) { final JavaPsiFacade facade = JavaPsiFacade.getInstance(project); final PsiClass listClass = JavaPsiFacade.getInstance(project).findClass(CommonClassNames.JAVA_UTIL_LIST, myArrayAccessExpression.getResolveScope()); - if (listClass == null) return false; + if (listClass == null) return null; final PsiElementFactory factory = facade.getElementFactory(); - final PsiType listType = factory.createType(listClass); - - return listType.isAssignableFrom(type); + return factory.createType(listClass); } @Override @@ -79,9 +93,46 @@ public class ReplaceWithListAccessFix implements IntentionAction { if (indexExpression == null) return; final PsiElementFactory factory = JavaPsiFacade.getInstance(project).getElementFactory(); + final CodeStyleManager codeStyleManager = CodeStyleManager.getInstance(project); + final PsiElement parent = myArrayAccessExpression.getParent(); - final PsiElement listAccess = factory.createExpressionFromText(arrayExpression.getText() + ".get(" + indexExpression.getText() + ")", parent); - myArrayAccessExpression.replace(listAccess); + if (parent instanceof PsiAssignmentExpression) { + final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)parent; + + final PsiExpression lExpression = assignmentExpression.getLExpression(); + final PsiExpression rExpression = assignmentExpression.getRExpression(); + if (lExpression.equals(myArrayAccessExpression) && parent.getParent() instanceof PsiExpressionStatement && rExpression != null) { + replaceWithSet(factory, codeStyleManager, arrayExpression, indexExpression, rExpression, assignmentExpression); + return; + } + } + replaceWithGet(factory, codeStyleManager, arrayExpression, indexExpression, myArrayAccessExpression); + } + + @NotNull + private static PsiElement replaceWithGet(@NotNull PsiElementFactory factory, + @NotNull CodeStyleManager codeStyleManager, + @NotNull PsiExpression arrayExpression, + @NotNull PsiExpression indexExpression, + @NotNull PsiElement anchor) { + + final PsiElement listAccess = factory.createExpressionFromText( + arrayExpression.getText() + ".get(" + indexExpression.getText() + ")", + anchor); + return anchor.replace(codeStyleManager.reformat(listAccess)); + } + + private static PsiElement replaceWithSet(@NotNull PsiElementFactory factory, + @NotNull CodeStyleManager codeStyleManager, + @NotNull PsiExpression arrayExpression, + @NotNull PsiExpression indexExpression, + @NotNull PsiExpression expression, + @NotNull PsiElement anchor) { + final PsiElement listAccess = factory.createExpressionFromText( + arrayExpression.getText() + ".set(" + indexExpression.getText() + "," + expression.getText() + ")", + anchor + ); + return anchor.replace(codeStyleManager.reformat(listAccess)); } @Override diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceWithListAccess/afterSetStatement.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceWithListAccess/afterSetStatement.java new file mode 100644 index 000000000000..4996ab43fd67 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceWithListAccess/afterSetStatement.java @@ -0,0 +1,9 @@ +// "Replace with list access" "true" + +import java.util.ArrayList; + +class A { + void test(ArrayList list) { + list.set(0, 5); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceWithListAccess/beforeAssignmentInIfCondition.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceWithListAccess/beforeAssignmentInIfCondition.java new file mode 100644 index 000000000000..0ddfbf37d796 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceWithListAccess/beforeAssignmentInIfCondition.java @@ -0,0 +1,11 @@ +// "Replace with list access" "false" + +import java.util.ArrayList; + +class A { + void test(ArrayList list) { + if (list[0] = 5 == 5){ + + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceWithListAccess/beforeSetStatement.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceWithListAccess/beforeSetStatement.java new file mode 100644 index 000000000000..fd502663b7f2 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceWithListAccess/beforeSetStatement.java @@ -0,0 +1,9 @@ +// "Replace with list access" "true" + +import java.util.ArrayList; + +class A { + void test(ArrayList list) { + list[0] = 5; + } +} \ No newline at end of file