Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ public J.Lambda visitLambda(J.Lambda lambda, ExecutionContext ctx) {
private boolean renameVariableIfUnusedInContext(J.VariableDeclarations.NamedVariable variable, J context) {
if (!UNDERSCORE.equals(variable.getName().getSimpleName()) &&
VariableReferences.findRhsReferences(context, variable.getName()).isEmpty() &&
!usedInModifyingUnary(variable.getName(), context)) {
!usedInModifyingUnary(variable.getName(), context) &&
!usedAsAssignmentTarget(variable.getName(), context)) {
doAfterVisit(new RenameVariable<>(variable, UNDERSCORE));
return true;
}
Expand All @@ -121,6 +122,18 @@ public J.Unary visitUnary(J.Unary unary, AtomicBoolean atomicBoolean) {
}
}.reduce(context, new AtomicBoolean(false)).get();
}

private boolean usedAsAssignmentTarget(J.Identifier identifier, J context) {
return new JavaIsoVisitor<AtomicBoolean>() {
@Override
public J.Assignment visitAssignment(J.Assignment assignment, AtomicBoolean atomicBoolean) {
if (SemanticallyEqual.areEqual(identifier, assignment.getVariable())) {
atomicBoolean.set(true);
}
return super.visitAssignment(assignment, atomicBoolean);
}
}.reduce(context, new AtomicBoolean(false)).get();
}
});
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -514,4 +514,76 @@ int countOrders(List<String> orders) {
)
);
}

@Test
void doNotReplaceWhenLambdaParamIsAssignmentTarget() {
rewriteRun(
//language=java
java(
"""
import java.util.function.BinaryOperator;

class Test {
void test() {
BinaryOperator<String> op = (a, b) -> a = "value";
}
}
""",
"""
import java.util.function.BinaryOperator;

class Test {
void test() {
BinaryOperator<String> op = (a, _) -> a = "value";
}
}
"""
)
);
}

@Test
void doNotReplaceWhenSecondLambdaParamIsAssignmentTarget() {
rewriteRun(
//language=java
java(
"""
import java.util.function.BinaryOperator;

class Test {
void test() {
BinaryOperator<String> op = (a, b) -> b = "value";
}
}
""",
"""
import java.util.function.BinaryOperator;

class Test {
void test() {
BinaryOperator<String> op = (_, b) -> b = "value";
}
}
"""
)
);
}

@Test
void doNotReplaceWhenSingleLambdaParamIsAssignmentTarget() {
rewriteRun(
//language=java
java(
"""
import java.util.function.UnaryOperator;

class Test {
void test() {
UnaryOperator<String> op = a -> a = "value";
}
}
"""
)
);
}
}
Loading