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

[java-inspections] 'map.putAll(Map.of("key", "value"))' could be simplified to 'map.put("key", "value")' IDEA-271418

Browse Source 
GitOrigin-RevId: 05ac65c6ba692b3af70189cb4e1b173d31ea7268
This commit is contained in:
Andrey.Cherkasov
2021-09-08 11:33:16 +00:00
committed by intellij-monorepo-bot
parent a89d9780bd
commit f625bb942d
4 changed files with 50 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/redundantCollectionOperation/afterPutAllMapOf.java
+8
View File
@@ -0,0 +1,8 @@
// "Replace with 'put()'" "true"
import java.util.*;
class Test {
void test(Map<Integer, String> map) {
map.put(1, "one");
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/redundantCollectionOperation/beforePutAllMapOf.java
+8
View File
@@ -0,0 +1,8 @@
// "Replace with 'put()'" "true"
import java.util.*;
class Test {
void test(Map<Integer, String> map) {
map.put<caret>All(Map.of(1, "one"));
}
}
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/RedundantCollectionOperationInspectionTest.java
+8
View File
@@ -3,9 +3,11 @@ package com.intellij.java.codeInsight.daemon.quickFix;
import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCase;
import com.intellij.codeInspection.LocalInspectionTool;
import com.intellij.testFramework.LightProjectDescriptor;
import com.siyeh.ig.redundancy.RedundantCollectionOperationInspection;
import org.jetbrains.annotations.NotNull;
import static com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase.JAVA_9;
public class RedundantCollectionOperationInspectionTest extends LightQuickFixParameterizedTestCase {
@Override
@@ -19,4 +21,10 @@ public class RedundantCollectionOperationInspectionTest extends LightQuickFixPar
protected String getBasePath() {
return "/codeInsight/daemonCodeAnalyzer/quickFix/redundantCollectionOperation";
}
@NotNull
@Override
protected LightProjectDescriptor getProjectDescriptor() {
return JAVA_9;
}
}
plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/RedundantCollectionOperationInspection.java
+26 -25
View File
@@ -67,18 +67,21 @@ public class RedundantCollectionOperationInspection extends AbstractBaseJavaLoca
private static final CallMatcher ITERABLE_ITERATOR = instanceCall(CommonClassNames.JAVA_LANG_ITERABLE, "iterator").parameterCount(0);
private static final CallMatcher MAP_KEY_SET = instanceCall(CommonClassNames.JAVA_UTIL_MAP, "keySet").parameterCount(0);
private static final CallMatcher MAP_VALUES = instanceCall(CommonClassNames.JAVA_UTIL_MAP, "values").parameterCount(0);
private static final CallMatcher MAP_PUT_ALL = instanceCall(CommonClassNames.JAVA_UTIL_MAP, "putAll").parameterCount(1);
private static final CallMatcher MAP_OF = staticCall(CommonClassNames.JAVA_UTIL_MAP, "of").parameterCount(2);
private static final CallMapper<RedundantCollectionOperationHandler> HANDLERS =
new CallMapper<RedundantCollectionOperationHandler>()
.register(TO_ARRAY, AsListToArrayHandler::handler)
.register(CONTAINS_ALL, ContainsAllSingletonHandler::handler)
.register(CONTAINS_ALL, call -> createHandler(call, SINGLETON, "contains"))
.register(CONTAINS, SingletonContainsHandler::handler)
.register(CONTAINS, MapKeySetContainsHandler::handler)
.register(anyOf(CONTAINS, CONTAINS_KEY), ContainsBeforeAddRemoveHandler::handler)
.register(REMOVE_BY_INDEX, RedundantIndexOfHandler::handler)
.register(AS_LIST, RedundantAsListForIterationHandler::handler)
.register(AS_LIST, RedundantSortAsListHandler::handler)
.register(ITERABLE_ITERATOR, RedundantEmptyIteratorHandler::handler);
.register(ITERABLE_ITERATOR, RedundantEmptyIteratorHandler::handler)
.register(MAP_PUT_ALL, call -> createHandler(call, MAP_OF, "put"));
@NotNull
@Override
@@ -365,30 +368,28 @@ public class RedundantCollectionOperationInspection extends AbstractBaseJavaLoca
}
}
private static class ContainsAllSingletonHandler implements RedundantCollectionOperationHandler {
@Override
public @NotNull @NlsSafe String getReplacement() {
return "contains()";
}
private static RedundantCollectionOperationHandler createHandler(PsiMethodCallExpression call,
CallMatcher matcher,
String replacementMethod) {
PsiExpression arg = call.getArgumentList().getExpressions()[0];
PsiMethodCallExpression argCall = tryCast(PsiUtil.skipParenthesizedExprDown(arg), PsiMethodCallExpression.class);
if (!matcher.test(argCall)) return null;
return new RedundantCollectionOperationHandler() {
@Override
public @NotNull @NlsSafe String getReplacement() {
return replacementMethod + "()";
}
@Override
public void performFix(@NotNull Project project, @NotNull PsiMethodCallExpression call) {
PsiExpression arg = ArrayUtil.getFirstElement(call.getArgumentList().getExpressions());
if (arg == null) return;
PsiMethodCallExpression singleton = tryCast(PsiUtil.skipParenthesizedExprDown(arg), PsiMethodCallExpression.class);
if (singleton == null) return;
PsiExpression singletonArg = ArrayUtil.getFirstElement(singleton.getArgumentList().getExpressions());
if (singletonArg == null) return;
ExpressionUtils.bindCallTo(call, "contains");
new CommentTracker().replaceAndRestoreComments(arg, singletonArg);
}
public static RedundantCollectionOperationHandler handler(PsiMethodCallExpression call) {
PsiExpression containsAllArg = call.getArgumentList().getExpressions()[0];
PsiMethodCallExpression maybeSingleton = tryCast(PsiUtil.skipParenthesizedExprDown(containsAllArg), PsiMethodCallExpression.class);
if (!SINGLETON.test(maybeSingleton)) return null;
return new ContainsAllSingletonHandler();
}
@Override
public void performFix(@NotNull Project project, @NotNull PsiMethodCallExpression call) {
PsiExpression arg = ArrayUtil.getFirstElement(call.getArgumentList().getExpressions());
if (arg == null) return;
PsiMethodCallExpression argCall = tryCast(PsiUtil.skipParenthesizedExprDown(arg), PsiMethodCallExpression.class);
if (argCall == null) return;
ExpressionUtils.bindCallTo(call, replacementMethod);
new CommentTracker().replaceAndRestoreComments(call.getArgumentList(), argCall.getArgumentList());
}
};
}
private static class SingletonContainsHandler implements RedundantCollectionOperationHandler {