Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature(LambdaBlockToExpression): convert lambda with method invocation as well #241

Merged
merged 6 commits into from
Jan 16, 2024
Merged

feature(LambdaBlockToExpression): convert lambda with method invocation as well #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c5b2a05
add 2 test cases for method invocation
timo-abele Jan 16, 2024
59129f9
add transform for lambdas with method invocation
timo-abele Jan 16, 2024
5300570
remove test with external dependency
timo-abele Jan 16, 2024
416f455
fix other test
timo-abele Jan 16, 2024
45d611a
Retain original prefix to minimize diff
timtebeek Jan 16, 2024
2c21cfa
Extract statement to local variable
timtebeek Jan 16, 2024
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
22 changes: 16 additions & 6 deletions src/main/java/org/openrewrite/staticanalysis/LambdaBlockToExpression.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,22 @@ public J.Lambda visitLambda(J.Lambda lambda, ExecutionContext ctx) {
J.Lambda l = super.visitLambda(lambda, ctx);
if (lambda.getBody() instanceof J.Block) {
List<Statement> statements = ((J.Block) lambda.getBody()).getStatements();
if (statements.size() == 1 && statements.get(0) instanceof J.Return) {
Space prefix = statements.get(0).getPrefix();
if (prefix.getComments().isEmpty()) {
return l.withBody(((J.Return) statements.get(0)).getExpression());
} else {
return l.withBody(((J.Return) statements.get(0)).getExpression().withPrefix(prefix));
if (statements.size() == 1) {
Statement statement = statements.get(0);
Space prefix = statement.getPrefix();
if (statement instanceof J.Return) {
Expression expression = ((J.Return) statement).getExpression();
if (prefix.getComments().isEmpty()) {
return l.withBody(expression);
} else {
return l.withBody(expression.withPrefix(prefix));
}
} else if (statement instanceof J.MethodInvocation) {
if (prefix.getComments().isEmpty()) {
return l.withBody(statement);
} else {
return l.withBody(statement.withPrefix(prefix));
}
}
}
}
Expand Down
31 changes: 31 additions & 0 deletions src/test/java/org/openrewrite/staticanalysis/LambdaBlockToExpressionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,35 @@ void doTest() {
);
}

@Issue("https://github.com/openrewrite/rewrite-static-analysis/issues/236")
@Test
void simplifyLambdaBlockReturningVoidAsWell2() {
//language=java
rewriteRun(
java(
"""
public class Main {

public void run() {
Runnable runHelloWorld = () -> {
System.out.println("Hello world!");
};
runHelloWorld.run();
}
}
""",
"""
public class Main {

public void run() {
Runnable runHelloWorld = () ->
System.out.println("Hello world!");
runHelloWorld.run();
}
}
"""
)
);
}

}
7 changes: 3 additions & 4 deletions src/test/java/org/openrewrite/staticanalysis/UseLambdaForFunctionalInterfaceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,10 +299,9 @@ class Test {
void bar(Consumer<Integer> c) {
}
void foo() {
bar(i -> {
bar(i2 -> {
});
});
bar(i ->
bar(i2 -> {
}));
}
}
"""
Expand Down