Skip to content

Adopt Style.from instead of SourceFile.getStyle #859

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 4 commits into from
Sep 30, 2025
Merged

Adopt Style.from instead of SourceFile.getStyle #859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a372a61
StyleFrom
timtebeek Sep 30, 2025
f4d9d06
Replace Optional with method that takes a default value
timtebeek Sep 30, 2025
1aa40fc
Polish
timtebeek Sep 30, 2025
741d979
Replace null check with default
timtebeek Sep 30, 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
10 changes: 4 additions & 6 deletions src/main/java/org/openrewrite/java/migrate/UseTabsOrSpaces.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.openrewrite.java.style.TabsAndIndentsStyle;
import org.openrewrite.java.tree.J;
import org.openrewrite.java.tree.JavaSourceFile;
import org.openrewrite.style.Style;

import static java.util.Objects.requireNonNull;

Expand All @@ -43,7 +44,7 @@ public String getDisplayName() {
@Override
public String getDescription() {
return "This is useful for one-off migrations of a codebase that has mixed indentation styles, while " +
"preserving all other auto-detected formatting rules.";
"preserving all other auto-detected formatting rules.";
}

@Override
Expand All @@ -53,11 +54,8 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
public J visit(@Nullable Tree tree, ExecutionContext ctx) {
if (tree instanceof JavaSourceFile) {
JavaSourceFile cu = (JavaSourceFile) requireNonNull(tree);
TabsAndIndentsStyle style = ((SourceFile) cu).getStyle(TabsAndIndentsStyle.class);
if (style == null) {
style = IntelliJ.tabsAndIndents();
}
style = style.withUseTabCharacter(useTabs);
TabsAndIndentsStyle style = Style.from(TabsAndIndentsStyle.class, cu, IntelliJ::tabsAndIndents)
.withUseTabCharacter(useTabs);
return new NormalizeTabsOrSpacesVisitor<>(style).visit(tree, ctx);
}
return (J) tree;
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/org/openrewrite/java/migrate/lang/UseTextBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@
import org.openrewrite.java.tree.TypeUtils;
import org.openrewrite.marker.Markers;
import org.openrewrite.staticanalysis.kotlin.KotlinFileChecker;
import org.openrewrite.style.Style;

import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Base64;
import java.util.List;
import java.util.Optional;

import static java.util.Objects.requireNonNull;
import static java.util.stream.Collectors.toList;
Expand Down Expand Up @@ -145,8 +145,7 @@ private J.Literal toTextBlock(J.Binary binary, String content, List<J.Literal> s
}
}

TabsAndIndentsStyle tabsAndIndentsStyle = Optional.ofNullable(getCursor().firstEnclosingOrThrow(SourceFile.class)
.getStyle(TabsAndIndentsStyle.class)).orElse(IntelliJ.tabsAndIndents());
TabsAndIndentsStyle tabsAndIndentsStyle = Style.from(TabsAndIndentsStyle.class, getCursor().firstEnclosingOrThrow(SourceFile.class), IntelliJ::tabsAndIndents);
boolean useTab = tabsAndIndentsStyle.getUseTabCharacter();
int tabSize = tabsAndIndentsStyle.getTabSize();

Expand Down