Skip to content

Keep indentation when running FinalizePrivateFields #675

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 2 commits into from
Jul 28, 2025
Merged

Keep indentation when running FinalizePrivateFields #675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f523e4c
Add test
jevanlingen Jul 28, 2025
6692c24
Impl
jevanlingen Jul 28, 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
9 changes: 4 additions & 5 deletions src/main/java/org/openrewrite/staticanalysis/FinalizePrivateFields.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,13 +106,12 @@ public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations m
.allMatch(privateFieldsToBeFinalized::contains);

if (canAllVariablesBeFinalized) {
mv = autoFormat(mv.withVariables(ListUtils.map(mv.getVariables(), v -> {
return mv.withVariables(ListUtils.map(mv.getVariables(), v -> {
JavaType.Variable type = v.getVariableType();
return type != null ? v.withVariableType(type.withFlags(
Flag.bitMapToFlags(type.getFlagsBitMap() | Flag.Final.getBitMask()))) : null;
return type != null ? v.withVariableType(type.withFlags(Flag.bitMapToFlags(type.getFlagsBitMap() | Flag.Final.getBitMask()))) : null;
})).withModifiers(ListUtils.concat(mv.getModifiers(),
new J.Modifier(Tree.randomId(), Space.EMPTY, Markers.EMPTY, isInstanceOfCs(topLevel) ? "readonly" : "final",
isInstanceOfCs(topLevel) ? J.Modifier.Type.LanguageExtension : J.Modifier.Type.Final, emptyList()))), ctx);
new J.Modifier(Tree.randomId(), mv.getModifiers().isEmpty() ? Space.EMPTY : Space.SINGLE_SPACE, Markers.EMPTY, isInstanceOfCs(topLevel) ? "readonly" : "final",
isInstanceOfCs(topLevel) ? J.Modifier.Type.LanguageExtension : J.Modifier.Type.Final, emptyList())));
}

return mv;
Expand Down
30 changes: 30 additions & 0 deletions src/test/java/org/openrewrite/staticanalysis/FinalizePrivateFieldsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -896,4 +896,34 @@ public class Reproducer {
)
);
}

@Test
void keepIndentation() {
rewriteRun(
//language=java
java(
"""
import java.io.InputStream;

class A {
private InputStream in;

public A(InputStream aInputStream) {
in = aInputStream;
}
}
""",
"""
import java.io.InputStream;

class A {
private final InputStream in;

public A(InputStream aInputStream) {
in = aInputStream;
}
}
"""
));
}
}