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

remove unnecessary parentheses in IDEA-161061 Quick-fix to replace nullableExpr.equals(...) with Objects.equals(nullableExpr, ...) (IDEA-CR-13960)

Browse Source
This commit is contained in:
peter
2016-09-21 10:49:59 +02:00
parent 273b3ed9a7
commit 853fc23fe1
3 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/ReplaceWithObjectsEqualsFix.java
View File

@@ -32,17 +32,19 @@ import org.jetbrains.annotations.Nullable;
* @author peter
*/
class ReplaceWithObjectsEqualsFix implements LocalQuickFix {
private final String myText;
private final String myQualifierText;
private final String myReplacementText;
private ReplaceWithObjectsEqualsFix(String text) {
myText = text;
private ReplaceWithObjectsEqualsFix(String qualifierText, String replacementText) {
myQualifierText = qualifierText;
myReplacementText = replacementText;
}
@Nls
@NotNull
@Override
public String getName() {
return "Replace '" + myText + ".equals(...)' with 'Objects.equals(" + myText + ", ...)'";
return "Replace '" + myQualifierText + ".equals(...)' with 'Objects.equals(" + myReplacementText + ", ...)'";
}
@Nls
@@ -57,11 +59,10 @@ class ReplaceWithObjectsEqualsFix implements LocalQuickFix {
PsiMethodCallExpression call = PsiTreeUtil.getParentOfType(descriptor.getPsiElement(), PsiMethodCallExpression.class);
if (call == null || !FileModificationService.getInstance().prepareFileForWrite(call.getContainingFile())) return;
PsiElement qualifier = call.getMethodExpression().getQualifier();
PsiExpression[] args = call.getArgumentList().getExpressions();
if (qualifier == null || args.length != 1) return;
if (args.length != 1) return;
String replacementText = "java.util.Objects.equals(" + qualifier.getText() + ", " + args[0].getText() + ")";
String replacementText = "java.util.Objects.equals(" + myReplacementText + ", " + args[0].getText() + ")";
PsiElement replaced = call.replace(JavaPsiFacade.getElementFactory(project).createExpressionFromText(replacementText, call));
JavaCodeStyleManager.getInstance(project).shortenClassReferences(((PsiMethodCallExpression)replaced).getMethodExpression());
}
@@ -75,13 +76,14 @@ class ReplaceWithObjectsEqualsFix implements LocalQuickFix {
}
PsiExpression qualifier = methodExpression.getQualifierExpression();
if (qualifier == null) return null;
PsiExpression noParens = PsiUtil.skipParenthesizedExprDown(qualifier);
if (noParens == null) return null;
PsiMethod method = call.resolveMethod();
if (method != null &&
method.getParameterList().getParametersCount() == 1 &&
method.getParameterList().getParameters()[0].getType().equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) {
return new ReplaceWithObjectsEqualsFix(qualifier.getText());
return new ReplaceWithObjectsEqualsFix(qualifier.getText(), noParens.getText());
}
return null;
}

16
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceWithObjectsEquals/afterTernary.java Normal file
View File

@@ -0,0 +1,16 @@
// "Replace '(random() ? foo() : bar()).equals(...)' with 'Objects.equals(random() ? foo() : bar(), ...)'" "true"
import org.jetbrains.annotations.*;
import java.util.Objects;
class A{
void test(Object bar) {
if (Objects.equals(random() ? foo() : bar(), bar)) {}
}
@Nullable Object foo();
@Nullable Object bar();
boolean random();
}

14
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/replaceWithObjectsEquals/beforeTernary.java Normal file
View File

@@ -0,0 +1,14 @@
// "Replace '(random() ? foo() : bar()).equals(...)' with 'Objects.equals(random() ? foo() : bar(), ...)'" "true"
import org.jetbrains.annotations.*;
class A{
void test(Object bar) {
if ((random() ? foo() : bar()).equa<caret>ls(bar)) {}
}
@Nullable Object foo();
@Nullable Object bar();
boolean random();
}