Skip to content

Polish UsePortableNewlines #731

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

Merged
merged 6 commits into from
Sep 8, 2025
Merged

Polish UsePortableNewlines #731

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ea5fe15
Use Preconditions.check with Preconditions.or in UsePortableNewlines
timtebeek Sep 8, 2025
66ef16c
Minimize what's converted
timtebeek Sep 8, 2025
39af339
Minimize implementation further
timtebeek Sep 8, 2025
830eff0
Add text block tests for UsePortableNewlines recipe
timtebeek Sep 8, 2025
d2bb15f
Assert handling of text blocks with newlines
timtebeek Sep 8, 2025
ef72c29
Use static import
timtebeek Sep 8, 2025
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
17 changes: 14 additions & 3 deletions src/main/java/org/openrewrite/staticanalysis/UsePortableNewlines.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,13 @@
import lombok.Value;
import org.openrewrite.Cursor;
import org.openrewrite.ExecutionContext;
import org.openrewrite.Preconditions;
import org.openrewrite.Recipe;
import org.openrewrite.TreeVisitor;
import org.openrewrite.internal.ListUtils;
import org.openrewrite.java.JavaIsoVisitor;
import org.openrewrite.java.MethodMatcher;
import org.openrewrite.java.search.UsesMethod;
import org.openrewrite.java.tree.Expression;
import org.openrewrite.java.tree.J;

Expand Down Expand Up @@ -64,7 +66,16 @@ public Duration getEstimatedEffortPerOccurrence() {

@Override
public TreeVisitor<?, ExecutionContext> getVisitor() {
return new JavaIsoVisitor<ExecutionContext>() {
return Preconditions.check(
Preconditions.or(
new UsesMethod<>(STRING_FORMAT),
new UsesMethod<>(STRING_FORMATTED),
new UsesMethod<>(PRINT_STREAM_PRINTF),
new UsesMethod<>(PRINT_WRITER_PRINTF),
new UsesMethod<>(FORMATTER_FORMAT),
new UsesMethod<>(CONSOLE_PRINTF)
),
new JavaIsoVisitor<ExecutionContext>() {

@Override
public J.Literal visitLiteral(J.Literal literal, ExecutionContext ctx) {
Expand All @@ -82,7 +93,7 @@ public J.Literal visitLiteral(J.Literal literal, ExecutionContext ctx) {
// Direct use in method invocation
if (value instanceof J.MethodInvocation) {
J.MethodInvocation mi = (J.MethodInvocation) value;
if (isFormatMethod(mi) && mi.getArguments().size() > 0 && mi.getArguments().get(0) == literal) {
if (isFormatMethod(mi) && !mi.getArguments().isEmpty() && mi.getArguments().get(0) == literal) {
return replaceNewlineInLiteral(l);
}
}
Expand Down Expand Up @@ -176,6 +187,6 @@ private J.MethodInvocation replaceNewlineInFormatString(J.MethodInvocation mi) {

return mi;
}
};
});
}
}