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

OptionalToIfInspection: propagate rename to nested operations for flatMap and or

Browse Source 
GitOrigin-RevId: 338d1c5e49a05fdd0ab60321275acc7ac51bcb4d
This commit is contained in:
Artemiy Sartakov
2020-04-30 05:32:53 +00:00
committed by intellij-monorepo-bot
parent 6e44d7266e
commit fcd1363aee
5 changed files with 70 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInspection/optionalToIf/IntermediateOperation.java
+48 -49
View File
@@ -6,13 +6,13 @@ import com.intellij.codeInspection.streamToLoop.ChainVariable;
import com.intellij.codeInspection.streamToLoop.FunctionHelper;
import com.intellij.psi.PsiExpression;
import com.intellij.psi.PsiMethodCallExpression;
import com.intellij.util.containers.ContainerUtil;
import one.util.streamex.StreamEx;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.List;
import java.util.stream.Collectors;
import static com.intellij.util.ObjectUtils.tryCast;
@@ -42,6 +42,32 @@ abstract class IntermediateOperation implements Operation {
return null;
}
private static @NotNull OperationRecord replaceFnVariable(@NotNull String oldName,
@NotNull OperationRecord record,
@NotNull ChainVariable outerVar,
@NotNull OptionalToIfContext context) {
ChainVariable inVar = replaceFnVariable(oldName, record.myInVar, outerVar);
ChainVariable outVar = replaceFnVariable(oldName, record.myOutVar, outerVar);
Operation operation = record.myOperation;
operation.rename(oldName, outerVar, context);
return new OperationRecord(inVar, outVar, operation);
}
private static @NotNull ChainVariable replaceFnVariable(@NotNull String oldName,
@NotNull ChainVariable variable,
@NotNull ChainVariable replacement) {
return oldName.equals(variable.getName()) ? replacement : variable;
}
private static @Nullable List<OperationRecord> extractRecords(@NotNull FunctionHelper fn) {
PsiMethodCallExpression chainExpression = tryCast(fn.getExpression(), PsiMethodCallExpression.class);
if (chainExpression == null) return null;
List<Operation> operations = OptionalToIfInspection.extractOperations(chainExpression, false);
if (operations == null || operations.isEmpty()) return null;
return OptionalToIfInspection.createRecords(operations);
}
static class Filter extends IntermediateOperation {
private final FunctionHelper myFn;
@@ -58,8 +84,8 @@ abstract class IntermediateOperation implements Operation {
}
@Override
public void rename(@NotNull String oldName, @NotNull String newName, @NotNull OptionalToIfContext context) {
myFn.rename(oldName, newName, context);
public void rename(@NotNull String oldName, @NotNull ChainVariable newVar, @NotNull OptionalToIfContext context) {
myFn.rename(oldName, newVar.getName(), context);
}
@Override
@@ -94,8 +120,8 @@ abstract class IntermediateOperation implements Operation {
}
@Override
public void rename(@NotNull String oldName, @NotNull String newName, @NotNull OptionalToIfContext context) {
myFn.rename(oldName, newName, context);
public void rename(@NotNull String oldName, @NotNull ChainVariable newVar, @NotNull OptionalToIfContext context) {
myFn.rename(oldName, newVar.getName(), context);
}
@NotNull
@@ -118,7 +144,7 @@ abstract class IntermediateOperation implements Operation {
static class Or extends IntermediateOperation {
private final List<OperationRecord> myRecords;
private List<OperationRecord> myRecords;
@Contract(pure = true)
Or(List<OperationRecord> records) {
@@ -132,8 +158,8 @@ abstract class IntermediateOperation implements Operation {
}
@Override
public void rename(@NotNull String oldName, @NotNull String newName, @NotNull OptionalToIfContext context) {
myRecords.forEach(r -> r.myOperation.rename(oldName, newName, context));
public void rename(@NotNull String oldName, @NotNull ChainVariable newVar, @NotNull OptionalToIfContext context) {
myRecords = ContainerUtil.map(myRecords, r -> replaceFnVariable(oldName, r, newVar, context));
}
@NotNull
@@ -142,12 +168,6 @@ abstract class IntermediateOperation implements Operation {
return StreamEx.of(myRecords).flatMap(or -> StreamEx.of(or).append(or.myOperation.nestedOperations()));
}
@Nullable
static Or create(@NotNull FunctionHelper fn) {
List<OperationRecord> records = extractRecords(fn);
return records == null ? null : new Or(records);
}
@Nullable
@Override
public String generate(@NotNull ChainVariable inVar,
@@ -162,6 +182,11 @@ abstract class IntermediateOperation implements Operation {
"\n}" +
context.generateNotNullCondition(outVar.getName(), code);
}
static @Nullable Or create(@NotNull FunctionHelper fn) {
List<OperationRecord> records = extractRecords(fn);
return records == null ? null : new Or(records);
}
}
static class FlatMap extends IntermediateOperation {
@@ -184,14 +209,6 @@ abstract class IntermediateOperation implements Operation {
return myVarName.equals(outVar.getName()) ? inVar : outVar;
}
@Nullable
static FlatMap create(@NotNull FunctionHelper fn) {
String varName = fn.tryLightTransform();
if (varName == null) return null;
List<OperationRecord> records = extractRecords(fn);
return records == null ? null : new FlatMap(records, varName, fn);
}
@NotNull
@Override
public StreamEx<OperationRecord> nestedOperations() {
@@ -205,31 +222,15 @@ abstract class IntermediateOperation implements Operation {
@NotNull String code,
@NotNull OptionalToIfContext context) {
String elseBranch = context.getElseBranch();
List<OperationRecord> records = StreamEx.of(myRecords).map(r -> replaceFnVariable(r, inVar, context)).collect(Collectors.toList());
List<OperationRecord> records = ContainerUtil.map(myRecords, r -> replaceFnVariable(myVarName, r, inVar, context));
String wrapped = OptionalToIfInspection.wrapCode(context, records, code);
context.setElseBranch(elseBranch);
return wrapped;
}
@NotNull
@Contract("_, _, _ -> new")
private OperationRecord replaceFnVariable(@NotNull OperationRecord record,
@NotNull ChainVariable outerVar,
@NotNull OptionalToIfContext context) {
ChainVariable inVar = replaceFnVariable(record.myInVar, outerVar);
ChainVariable outVar = replaceFnVariable(record.myOutVar, outerVar);
Operation operation = record.myOperation;
operation.rename(myVarName, outerVar.getName(), context);
return new OperationRecord(inVar, outVar, operation);
}
private ChainVariable replaceFnVariable(@NotNull ChainVariable variable, @NotNull ChainVariable replacement) {
return myVarName.equals(variable.getName()) ? replacement : variable;
}
@Override
public void rename(@NotNull String oldName, @NotNull String newName, @NotNull OptionalToIfContext context) {
myRecords.forEach(r -> r.myOperation.rename(oldName, newName, context));
public void rename(@NotNull String oldName, @NotNull ChainVariable newVar, @NotNull OptionalToIfContext context) {
myRecords.forEach(r -> r.myOperation.rename(oldName, newVar, context));
}
@Override
@@ -240,14 +241,12 @@ abstract class IntermediateOperation implements Operation {
context.addLambdaVarName(name);
}
}
}
@Nullable
private static List<OperationRecord> extractRecords(@NotNull FunctionHelper fn) {
PsiMethodCallExpression chainExpression = tryCast(fn.getExpression(), PsiMethodCallExpression.class);
if (chainExpression == null) return null;
List<Operation> operations = OptionalToIfInspection.extractOperations(chainExpression, false);
if (operations == null || operations.isEmpty()) return null;
return OptionalToIfInspection.createRecords(operations);
static @Nullable FlatMap create(@NotNull FunctionHelper fn) {
String varName = fn.tryLightTransform();
if (varName == null) return null;
List<OperationRecord> records = extractRecords(fn);
return records == null ? null : new FlatMap(records, varName, fn);
}
}
}
java/java-impl/src/com/intellij/codeInspection/optionalToIf/Operation.java
+1 -1
View File
@@ -15,7 +15,7 @@ interface Operation {
@Nullable
String generate(@NotNull ChainVariable inVar, @NotNull ChainVariable outVar, @NotNull String code, @NotNull OptionalToIfContext context);
default void rename(@NotNull String oldName, @NotNull String newName, @NotNull OptionalToIfContext context) {}
default void rename(@NotNull String oldName, @NotNull ChainVariable newVar, @NotNull OptionalToIfContext context) {}
default void preprocessVariables(@NotNull ChainVariable inVar, @NotNull ChainVariable outVar, @NotNull OptionalToIfContext context) {}
java/java-impl/src/com/intellij/codeInspection/optionalToIf/SourceOperation.java
+4 -4
View File
@@ -57,8 +57,8 @@ abstract class SourceOperation implements Operation {
}
@Override
public void rename(@NotNull String oldName, @NotNull String newName, @NotNull OptionalToIfContext context) {
myArg = FunctionHelper.replaceVarReference(myArg, oldName, newName, context);
public void rename(@NotNull String oldName, @NotNull ChainVariable newVar, @NotNull OptionalToIfContext context) {
myArg = FunctionHelper.replaceVarReference(myArg, oldName, newVar.getName(), context);
}
@Nullable
@@ -101,8 +101,8 @@ abstract class SourceOperation implements Operation {
}
@Override
public void rename(@NotNull String oldName, @NotNull String newName, @NotNull OptionalToIfContext context) {
myArg = FunctionHelper.replaceVarReference(myArg, oldName, newName, context);
public void rename(@NotNull String oldName, @NotNull ChainVariable newVar, @NotNull OptionalToIfContext context) {
myArg = FunctionHelper.replaceVarReference(myArg, oldName, newVar.getName(), context);
}
@Nullable
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/optionalToIf/afterFlatMap.java
+10
View File
@@ -58,6 +58,16 @@ class Test {
}
}
void nestedOr(String param0) {
boolean result;
result = true;
String s = null;
if (param0 == null) throw new NullPointerException();
String empty = null;
s = param0;
result = false;
}
void flatMapsWithSameParamName(String param0) {
if (param0 == null) throw new NullPointerException();
String s = "foo";
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/optionalToIf/beforeFlatMap.java
+7
View File
@@ -40,6 +40,13 @@ class Test {
.isPresent();
}
void nestedOr(String param0) {
boolean result;
result = Optional.of(param0)
.flatMap(var0 -> Optional.<String>empty().or(() -> Optional.of(var0)))
.isEmpty();
}
void flatMapsWithSameParamName(String param0) {
Optional.of(param0)
.flatMap(var0 -> Optional.of("foo").map(s -> ("foo").toLowerCase()))