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

StreamToLoop inspection: simplify toMap mergers (a,b)->a (use putIfAbsent) and (a,b)->b (use put)

Browse Source
This commit is contained in:
Tagir Valeev
2016-12-06 12:23:06 +07:00
parent f3d41d8a3c
commit f0c8802a27
4 changed files with 60 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInspection/streamToLoop/TerminalOperation.java
+22
View File
@@ -29,6 +29,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Arrays;
import java.util.Objects;
import java.util.function.Consumer;
import java.util.function.Function;
@@ -729,6 +730,27 @@ abstract class TerminalOperation extends Operation {
return "if("+map+".put("+myKeyExtractor.getText()+","+myValueExtractor.getText()+")!=null) {\n"+
"throw new java.lang.IllegalStateException(\"Duplicate key\");\n}\n";
}
if(myMerger instanceof PsiLambdaExpression) {
PsiLambdaExpression lambda = (PsiLambdaExpression)myMerger;
PsiParameter[] parameters = lambda.getParameterList().getParameters();
if(parameters.length == 2) {
PsiExpression body = LambdaUtil.extractSingleExpressionFromBody(lambda.getBody());
if(body instanceof PsiReferenceExpression) {
PsiReferenceExpression ref = (PsiReferenceExpression)body;
if(ref.getQualifierExpression() == null) {
// cannot use isReferenceTo here as lambda could be detached from PsiFile
if (Objects.equals(parameters[0].getName(), ref.getReferenceName())) {
// like (a, b) -> a
return map + ".putIfAbsent(" + myKeyExtractor.getText() + "," + myValueExtractor.getText() + ");\n";
}
else if (Objects.equals(parameters[1].getName(), ref.getReferenceName())) {
// like (a, b) -> b
return map + ".put(" + myKeyExtractor.getText() + "," + myValueExtractor.getText() + ");\n";
}
}
}
}
}
return map+".merge("+myKeyExtractor.getText()+","+myValueExtractor.getText()+","+myMerger.getText()+");\n";
}
}