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

IDEA-151523 Replace with collect when working with an existing collection

Browse Source
This commit is contained in:
Tagir Valeev
2016-09-08 15:22:06 +07:00
parent 8015562c2d
commit 55c8f0cf46
15 changed files with 69 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
java/java-analysis-impl/src/com/intellij/codeInspection/StreamApiMigrationInspection.java
View File

@@ -145,9 +145,21 @@ public class StreamApiMigrationInspection extends BaseJavaBatchLocalInspectionTo
}
if ((isArray || !isRawSubstitution(iteratedValueType, collectionClass)) && isCollectCall(tb, operations)) {
boolean addAll = operations.isEmpty() && isAddAllCall(tb);
holder.registerProblem(iteratedValue, "Can be replaced with " + (addAll ? "addAll call" : "collect call"),
String methodName;
if(addAll) {
methodName = "addAll";
} else {
PsiMethodCallExpression methodCallExpression = tb.getSingleMethodCall();
if(methodCallExpression != null && extractReplaceableCollectionInitializer(
methodCallExpression.getMethodExpression().getQualifierExpression(), statement) != null) {
methodName = "collect";
} else {
methodName = "forEach";
}
}
holder.registerProblem(iteratedValue, "Can be replaced with " + methodName + " call",
ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
addAll ? new ReplaceWithAddAllFix() : new ReplaceWithCollectFix());
new ReplaceWithCollectFix(methodName));
}
// do not replace for(T e : arr) {} with Arrays.stream(arr).forEach(e -> {}) even if flag is set
else if (!operations.isEmpty() ||
@@ -628,28 +640,37 @@ public class StreamApiMigrationInspection extends BaseJavaBatchLocalInspectionTo
return consumerClass != null ? psiFacade.getElementFactory().createType(consumerClass, variable.getType()) : null;
}
private static class ReplaceWithCollectFix extends ReplaceWithCollectAbstractFix {
@Override
protected String getMethodName() {
return "collect";
@Contract("null, _ -> null")
static PsiExpression extractReplaceableCollectionInitializer(PsiExpression qualifierExpression, PsiStatement foreachStatement) {
if (qualifierExpression instanceof PsiReferenceExpression) {
final PsiElement resolve = ((PsiReferenceExpression)qualifierExpression).resolve();
if (resolve instanceof PsiLocalVariable) {
PsiLocalVariable var = (PsiLocalVariable)resolve;
if (isDeclarationJustBefore(var, foreachStatement)) {
final PsiExpression initializer = var.getInitializer();
if (initializer instanceof PsiNewExpression) {
final PsiExpressionList argumentList = ((PsiNewExpression)initializer).getArgumentList();
if (argumentList != null && argumentList.getExpressions().length == 0) {
return initializer;
}
}
}
}
}
return null;
}
private static class ReplaceWithAddAllFix extends ReplaceWithCollectAbstractFix {
@Override
protected String getMethodName() {
return "addAll";
private static class ReplaceWithCollectFix extends MigrateToStreamFix {
final String myMethodName;
protected ReplaceWithCollectFix(String methodName) {
myMethodName = methodName;
}
}
private abstract static class ReplaceWithCollectAbstractFix extends MigrateToStreamFix {
protected abstract String getMethodName();
@NotNull
@Override
public String getFamilyName() {
return "Replace with " + getMethodName();
return "Replace with " + myMethodName;
}
@Override
@@ -682,29 +703,19 @@ public class StreamApiMigrationInspection extends BaseJavaBatchLocalInspectionTo
.add(createMapperFunctionalExpressionText(tb.getVariable(), methodCallExpression.getArgumentList().getExpressions()[0]));
final StringBuilder builder = generateStream(iteratedValue, intermediateOps);
builder.append(".collect(java.util.stream.Collectors.");
final PsiExpression qualifierExpression = methodCallExpression.getMethodExpression().getQualifierExpression();
if (qualifierExpression instanceof PsiReferenceExpression) {
final PsiElement resolve = ((PsiReferenceExpression)qualifierExpression).resolve();
if (resolve instanceof PsiLocalVariable) {
PsiLocalVariable var = (PsiLocalVariable)resolve;
if (isDeclarationJustBefore(var, foreachStatement)) {
final PsiExpression initializer = var.getInitializer();
if (initializer instanceof PsiNewExpression) {
final PsiExpressionList argumentList = ((PsiNewExpression)initializer).getArgumentList();
if (argumentList != null && argumentList.getExpressions().length == 0) {
final String callText = builder.toString() + createInitializerReplacementText(var.getType(), initializer) + ")";
PsiElement result = initializer.replace(elementFactory.createExpressionFromText(callText, null));
simplifyAndFormat(project, result);
foreachStatement.delete();
return;
}
}
}
}
final PsiExpression initializer = extractReplaceableCollectionInitializer(qualifierExpression, foreachStatement);
if(initializer != null) {
String callText = builder.append(".collect(java.util.stream.Collectors.")
.append(createInitializerReplacementText(qualifierExpression.getType(), initializer))
.append(")").toString();
PsiElement result = initializer.replace(elementFactory.createExpressionFromText(callText, null));
simplifyAndFormat(project, result);
foreachStatement.delete();
return;
}
final String qualifierText = qualifierExpression != null ? qualifierExpression.getText() : "";
final String callText = StringUtil.getQualifiedName(qualifierText, "addAll(" + builder.toString() + "toList()));");
final String qualifierText = qualifierExpression != null ? qualifierExpression.getText() : "this";
final String callText = builder.append(".forEach(").append(qualifierText).append("::add);").toString();
PsiElement result = foreachStatement.replace(elementFactory.createStatementFromText(callText, foreachStatement));
simplifyAndFormat(project, result);
}

5
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectArrayListCompoundDeclaration.java
View File

@@ -1,6 +1,5 @@
// "Replace with collect" "true"
// "Replace with forEach" "true"
import java.util.*;
import java.util.stream.Collectors;
public class Collect {
class Person {
@@ -11,6 +10,6 @@ public class Collect {
void collectNames(List<Person> persons){
List<String> names = new ArrayList<>(), otherNames = new ArrayList<>(names);
names.addAll(persons.stream().map(Person::getName).collect(Collectors.toList()));
persons.stream().map(Person::getName).forEach(names::add);
}
}

5
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectArrayListNonTrivialInitializer.java
View File

@@ -1,6 +1,5 @@
// "Replace with collect" "true"
// "Replace with forEach" "true"
import java.util.*;
import java.util.stream.Collectors;
public class Collect {
class Person {
@@ -15,6 +14,6 @@ public class Collect {
void collectNames(List<Person> persons){
List<String> names = foo();
names.addAll(persons.stream().map(Person::getName).collect(Collectors.toList()));
persons.stream().map(Person::getName).forEach(names::add);
}
}

5
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectHashSetFieldInitializer.java
View File

@@ -1,6 +1,5 @@
// "Replace with collect" "true"
// "Replace with forEach" "true"
import java.util.*;
import java.util.stream.Collectors;
public class Collect {
class Person {
@@ -11,6 +10,6 @@ public class Collect {
Set<String> names = new HashSet<>();
void collectNames(List<Person> persons){
names.addAll(persons.stream().map(Person::getName).collect(Collectors.toList()));
persons.stream().map(Person::getName).forEach(names::add);
}
}

5
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectSelfCollection.java
View File

@@ -1,6 +1,5 @@
// "Replace with collect" "true"
// "Replace with forEach" "true"
import java.util.*;
import java.util.stream.Collectors;
public abstract class Collect implements Collection<String>{
class Person {
@@ -10,6 +9,6 @@ public abstract class Collect implements Collection<String>{
}
void collectNames(List<Person> persons){
addAll(persons.stream().map(Person::getName).collect(Collectors.toList()));
persons.stream().map(Person::getName).forEach(this::add);
}
}

5
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCollectSetParameter.java
View File

@@ -1,6 +1,5 @@
// "Replace with collect" "true"
// "Replace with forEach" "true"
import java.util.*;
import java.util.stream.Collectors;
public class Collect {
class Person {
@@ -10,6 +9,6 @@ public class Collect {
}
void collectNames(List<Person> persons, Set<String> names){
names.addAll(persons.stream().map(Person::getName).collect(Collectors.toList()));
persons.stream().map(Person::getName).forEach(names::add);
}
}

5
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterCompactFilterToMethodReference.java
View File

@@ -1,10 +1,9 @@
// "Replace with collect" "true"
// "Replace with forEach" "true"
import java.util.List;
import java.util.stream.Collectors;
public class A {
private void withStream(List<String> stream, final List<String> activeFilters) {
activeFilters.addAll(stream.stream().filter(String::isEmpty).collect(Collectors.toList()));
stream.stream().filter(String::isEmpty).forEach(activeFilters::add);
}
}

5
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterPrimitive.java
View File

@@ -1,9 +1,8 @@
// "Replace with collect" "true"
// "Replace with forEach" "true"
import java.util.List;
import java.util.stream.Collectors;
class Sample {
public void some(List<String> from, List<Integer> to) {
to.addAll(from.stream().map(String::length).collect(Collectors.toList()));
from.stream().map(String::length).forEach(to::add);
}
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectArrayListCompoundDeclaration.java
View File

@@ -1,4 +1,4 @@
// "Replace with collect" "true"
// "Replace with forEach" "true"
import java.util.*;
public class Collect {

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectArrayListNonTrivialInitializer.java
View File

@@ -1,4 +1,4 @@
// "Replace with collect" "true"
// "Replace with forEach" "true"
import java.util.*;
public class Collect {

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectHashSetFieldInitializer.java
View File

@@ -1,4 +1,4 @@
// "Replace with collect" "true"
// "Replace with forEach" "true"
import java.util.*;
public class Collect {

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectSelfCollection.java
View File

@@ -1,4 +1,4 @@
// "Replace with collect" "true"
// "Replace with forEach" "true"
import java.util.*;
public abstract class Collect implements Collection<String>{

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCollectSetParameter.java
View File

@@ -1,4 +1,4 @@
// "Replace with collect" "true"
// "Replace with forEach" "true"
import java.util.*;
public class Collect {

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeCompactFilterToMethodReference.java
View File

@@ -1,4 +1,4 @@
// "Replace with collect" "true"
// "Replace with forEach" "true"
import java.util.List;

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforePrimitive.java
View File

@@ -1,4 +1,4 @@
// "Replace with collect" "true"
// "Replace with forEach" "true"
import java.util.List;
class Sample {