MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-13 21:55:01 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-161007 ComparatorCombinatorsInspection: better variable naming, support integer difference comparators

Browse Source
This commit is contained in:
Tagir Valeev
2016-09-16 12:48:58 +07:00
parent f4dae32d7f
commit d4e5f5a2c4
6 changed files with 86 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/ComparatorCombinatorsInspection.java
+65 -48
View File
@@ -21,6 +21,8 @@ import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.CodeStyleManager;
import com.intellij.psi.codeStyle.JavaCodeStyleManager;
import com.intellij.psi.codeStyle.SuggestedNameInfo;
import com.intellij.psi.codeStyle.VariableKind;
import com.intellij.psi.util.PsiTreeUtil;
import com.siyeh.ig.psiutils.EquivalenceChecker;
import com.siyeh.ig.psiutils.MethodUtils;
@@ -49,10 +51,10 @@ public class ComparatorCombinatorsInspection extends BaseJavaBatchLocalInspectio
return;
}
PsiElement body = LambdaUtil.extractSingleExpressionFromBody(lambda.getBody());
String methodName = null;
if (body instanceof PsiMethodCallExpression) {
PsiMethodCallExpression methodCall = (PsiMethodCallExpression)body;
PsiExpression[] args = methodCall.getArgumentList().getExpressions();
String methodName = null;
if (args.length == 1 && MethodUtils.isCompareToCall(methodCall)) {
PsiExpression left = methodCall.getMethodExpression().getQualifierExpression();
PsiExpression right = args[0];
@@ -91,11 +93,17 @@ public class ComparatorCombinatorsInspection extends BaseJavaBatchLocalInspectio
}
}
}
if (methodName != null) {
holder
.registerProblem(lambda, "Can be replaced with Comparator." + methodName, new ReplaceWithComparatorFix(methodName));
} else if (body instanceof PsiBinaryExpression) {
PsiBinaryExpression binOp = (PsiBinaryExpression)body;
if (binOp.getOperationTokenType().equals(JavaTokenType.MINUS) &&
areEquivalent(parameters, binOp.getLOperand(), binOp.getROperand())) {
methodName = "comparingInt";
}
}
if (methodName != null) {
holder
.registerProblem(lambda, "Can be replaced with Comparator." + methodName, new ReplaceWithComparatorFix(methodName));
}
}
};
}
@@ -150,49 +158,55 @@ public class ComparatorCombinatorsInspection extends BaseJavaBatchLocalInspectio
PsiParameter[] parameters = lambda.getParameterList().getParameters();
if (parameters.length != 2) return;
PsiElement body = LambdaUtil.extractSingleExpressionFromBody(lambda.getBody());
if (!(body instanceof PsiMethodCallExpression)) return;
PsiMethodCallExpression methodCall = (PsiMethodCallExpression)body;
PsiExpression keyExtractor = null;
String methodName = null;
if (MethodUtils.isCompareToCall(methodCall)) {
methodName = "comparing";
keyExtractor = methodCall.getMethodExpression().getQualifierExpression();
if (keyExtractor instanceof PsiReferenceExpression) {
PsiElement keyElement = ((PsiReferenceExpression)keyExtractor).resolve();
if(keyElement == parameters[0]) {
methodName = "naturalOrder";
}
else if(keyElement == parameters[1]) {
methodName = "reverseOrder";
if (body instanceof PsiMethodCallExpression) {
PsiMethodCallExpression methodCall = (PsiMethodCallExpression)body;
if (MethodUtils.isCompareToCall(methodCall)) {
methodName = "comparing";
keyExtractor = methodCall.getMethodExpression().getQualifierExpression();
if (keyExtractor instanceof PsiReferenceExpression) {
PsiElement keyElement = ((PsiReferenceExpression)keyExtractor).resolve();
if (keyElement == parameters[0]) {
methodName = "naturalOrder";
}
else if (keyElement == parameters[1]) {
methodName = "reverseOrder";
}
}
}
}
else {
PsiMethod method = methodCall.resolveMethod();
if (method != null && method.getName().equals("compare")) {
PsiClass containingClass = method.getContainingClass();
if (containingClass != null) {
String className = containingClass.getQualifiedName();
if (className != null) {
PsiExpression[] args = methodCall.getArgumentList().getExpressions();
if (args.length != 2) return;
keyExtractor = args[0];
switch (className) {
case CommonClassNames.JAVA_LANG_LONG:
methodName = "comparingLong";
break;
case CommonClassNames.JAVA_LANG_INTEGER:
methodName = "comparingInt";
break;
case CommonClassNames.JAVA_LANG_DOUBLE:
methodName = "comparingDouble";
break;
default:
return;
else {
PsiMethod method = methodCall.resolveMethod();
if (method != null && method.getName().equals("compare")) {
PsiClass containingClass = method.getContainingClass();
if (containingClass != null) {
String className = containingClass.getQualifiedName();
if (className != null) {
PsiExpression[] args = methodCall.getArgumentList().getExpressions();
if (args.length != 2) return;
keyExtractor = args[0];
switch (className) {
case CommonClassNames.JAVA_LANG_LONG:
methodName = "comparingLong";
break;
case CommonClassNames.JAVA_LANG_INTEGER:
methodName = "comparingInt";
break;
case CommonClassNames.JAVA_LANG_DOUBLE:
methodName = "comparingDouble";
break;
default:
return;
}
}
}
}
}
} else if(body instanceof PsiBinaryExpression) {
PsiBinaryExpression binOp = (PsiBinaryExpression)body;
if(!binOp.getOperationTokenType().equals(JavaTokenType.MINUS)) return;
methodName = "comparingInt";
keyExtractor = binOp.getLOperand();
}
if (methodName == null || keyExtractor == null) return;
if (!FileModificationService.getInstance().preparePsiElementForWrite(element)) return;
@@ -220,20 +234,23 @@ public class ComparatorCombinatorsInspection extends BaseJavaBatchLocalInspectio
if (LambdaCanBeMethodReferenceInspection.replaceLambdaWithMethodReference(factory, lambda) == lambda) {
PsiParameter parameter = parameters[0];
String name = parameter.getName();
String nameCandidate = null;
SuggestedNameInfo nameCandidate = null;
JavaCodeStyleManager codeStyleManager = JavaCodeStyleManager.getInstance(expression.getProject());
if (name != null) {
if (name.length() > 1 && name.endsWith("1")) {
nameCandidate = name.substring(0, name.length() - 1);
nameCandidate = codeStyleManager.suggestVariableName(VariableKind.PARAMETER, name.substring(0, name.length() - 1),
null, parameter.getType(), true);
} else if (name.equals("first")) {
nameCandidate =
codeStyleManager.suggestVariableName(VariableKind.PARAMETER, null, null, parameter.getType(), true);
}
}
if (nameCandidate != null) {
String newName = JavaCodeStyleManager.getInstance(expression.getProject()).suggestUniqueVariableName(nameCandidate, lambda, true);
if (newName.equals(nameCandidate)) {
Collection<PsiReferenceExpression> references = PsiTreeUtil.collectElementsOfType(body, PsiReferenceExpression.class);
StreamEx.of(references).filter(ref -> ref.resolve() == parameter).map(PsiJavaCodeReferenceElement::getReferenceNameElement)
.nonNull().forEach(nameElement -> nameElement.replace(factory.createIdentifier(newName)));
parameter.setName(newName);
}
String newName = codeStyleManager.suggestUniqueVariableName(nameCandidate, lambda, true).names[0];
Collection<PsiReferenceExpression> references = PsiTreeUtil.collectElementsOfType(body, PsiReferenceExpression.class);
StreamEx.of(references).filter(ref -> ref.resolve() == parameter).map(PsiJavaCodeReferenceElement::getReferenceNameElement)
.nonNull().forEach(nameElement -> nameElement.replace(factory.createIdentifier(newName)));
parameter.setName(newName);
}
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/comparatorCombinators/afterDouble.java
+1 -1
View File
@@ -4,7 +4,7 @@ import java.util.*;
public class Main {
void sort(List<Person> persons) {
persons.sort(Comparator.comparingDouble(p -> p.getName().length()));
persons.sort(Comparator.comparingDouble(person -> person.getName().length()));
}
interface Person {
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/comparatorCombinators/afterField.java
+1 -1
View File
@@ -5,7 +5,7 @@ import java.util.*;
public class Main {
void sort(List<Person> persons) {
String p;
persons.sort(Comparator.comparing(p1 -> p1.name));
persons.sort(Comparator.comparing(p2 -> p2.name));
}
class Person {
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/comparatorCombinators/afterIntegerDiff.java
+9
View File
@@ -0,0 +1,9 @@
// "Replace with Comparator.comparingInt" "true"
import java.util.*;
public class Main {
void sort(List<String> data) {
data.sort(Comparator.comparingInt(String::length));
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/comparatorCombinators/beforeDouble.java
+1 -1
View File
@@ -4,7 +4,7 @@ import java.util.*;
public class Main {
void sort(List<Person> persons) {
persons.sort((p1, p2) -> Double.com<caret>pare(p1.getName().length(), p2.getName().length()));
persons.sort((first, second) -> Double.com<caret>pare(first.getName().length(), second.getName().length()));
}
interface Person {
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/comparatorCombinators/beforeIntegerDiff.java
+9
View File
@@ -0,0 +1,9 @@
// "Replace with Comparator.comparingInt" "true"
import java.util.*;
public class Main {
void sort(List<String> data) {
data.sort((d1, d2) -> d1.length() - d2.le<caret>ngth());
}
}