Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 2419403

Browse files
knutwannhedenknutwannheden
committed
Polish Spaces and AutoFormatVisitor 
1 parent 7f43cc1 commit 2419403

File tree

2 files changed

+32
-36
lines changed

2 files changed

+32
-36
lines changed

‎rewrite-java/src/main/java/org/openrewrite/java/format/AutoFormatVisitor.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -57,30 +57,30 @@ public J visit(@Nullable Tree tree, P p, Cursor cursor) {
5757

5858
t = new MinimumViableSpacingVisitor<>(stopAfter).visit(t, p, cursor.fork());
5959

60-
t = new BlankLinesVisitor<>(Optional.ofNullable(((SourceFile) cu).getStyle(BlankLinesStyle.class))
60+
t = new BlankLinesVisitor<>(Optional.ofNullable(cu.getStyle(BlankLinesStyle.class))
6161
.orElse(IntelliJ.blankLines()), stopAfter)
6262
.visit(t, p, cursor.fork());
6363

64-
t = new WrappingAndBracesVisitor<>(Optional.ofNullable(((SourceFile) cu).getStyle(WrappingAndBracesStyle.class))
64+
t = new WrappingAndBracesVisitor<>(Optional.ofNullable(cu.getStyle(WrappingAndBracesStyle.class))
6565
.orElse(IntelliJ.wrappingAndBraces()), stopAfter)
6666
.visit(t, p, cursor.fork());
6767

6868
t = new SpacesVisitor<>(
69-
Optional.ofNullable(((SourceFile) cu).getStyle(SpacesStyle.class)).orElse(IntelliJ.spaces()),
70-
((SourceFile) cu).getStyle(EmptyForInitializerPadStyle.class),
71-
((SourceFile) cu).getStyle(EmptyForIteratorPadStyle.class),
69+
Optional.ofNullable(cu.getStyle(SpacesStyle.class)).orElse(IntelliJ.spaces()),
70+
cu.getStyle(EmptyForInitializerPadStyle.class),
71+
cu.getStyle(EmptyForIteratorPadStyle.class),
7272
stopAfter
7373
).visit(t, p, cursor.fork());
7474

75-
t = new NormalizeTabsOrSpacesVisitor<>(Optional.ofNullable(((SourceFile) cu).getStyle(TabsAndIndentsStyle.class))
75+
t = new NormalizeTabsOrSpacesVisitor<>(Optional.ofNullable(cu.getStyle(TabsAndIndentsStyle.class))
7676
.orElse(IntelliJ.tabsAndIndents()), stopAfter)
7777
.visit(t, p, cursor.fork());
7878

79-
t = new TabsAndIndentsVisitor<>(Optional.ofNullable(((SourceFile) cu).getStyle(TabsAndIndentsStyle.class))
79+
t = new TabsAndIndentsVisitor<>(Optional.ofNullable(cu.getStyle(TabsAndIndentsStyle.class))
8080
.orElse(IntelliJ.tabsAndIndents()), stopAfter)
8181
.visit(t, p, cursor.fork());
8282

83-
t = new NormalizeLineBreaksVisitor<>(Optional.ofNullable(((SourceFile) cu).getStyle(GeneralFormatStyle.class))
83+
t = new NormalizeLineBreaksVisitor<>(Optional.ofNullable(cu.getStyle(GeneralFormatStyle.class))
8484
.orElse(autodetectGeneralFormatStyle(cu)), stopAfter)
8585
.visit(t, p, cursor.fork());
8686

@@ -101,26 +101,26 @@ public J visit(@Nullable Tree tree, P p) {
101101
}
102102
JavaSourceFile t = (JavaSourceFile) new RemoveTrailingWhitespaceVisitor<>(stopAfter).visit(cu, p);
103103

104-
t = (JavaSourceFile) new BlankLinesVisitor<>(Optional.ofNullable(((SourceFile) cu).getStyle(BlankLinesStyle.class))
104+
t = (JavaSourceFile) new BlankLinesVisitor<>(Optional.ofNullable(cu.getStyle(BlankLinesStyle.class))
105105
.orElse(IntelliJ.blankLines()), stopAfter)
106106
.visit(t, p);
107107

108108
t = (JavaSourceFile) new SpacesVisitor<P>(Optional.ofNullable(
109-
((SourceFile) cu).getStyle(SpacesStyle.class)).orElse(IntelliJ.spaces()),
110-
((SourceFile) cu).getStyle(EmptyForInitializerPadStyle.class),
111-
((SourceFile) cu).getStyle(EmptyForIteratorPadStyle.class),
109+
cu.getStyle(SpacesStyle.class)).orElse(IntelliJ.spaces()),
110+
cu.getStyle(EmptyForInitializerPadStyle.class),
111+
cu.getStyle(EmptyForIteratorPadStyle.class),
112112
stopAfter)
113113
.visit(t, p);
114114

115-
t = (JavaSourceFile) new WrappingAndBracesVisitor<>(Optional.ofNullable(((SourceFile) cu).getStyle(WrappingAndBracesStyle.class))
115+
t = (JavaSourceFile) new WrappingAndBracesVisitor<>(Optional.ofNullable(cu.getStyle(WrappingAndBracesStyle.class))
116116
.orElse(IntelliJ.wrappingAndBraces()), stopAfter)
117117
.visit(t, p);
118118

119-
t = (JavaSourceFile) new NormalizeTabsOrSpacesVisitor<>(Optional.ofNullable(((SourceFile) cu).getStyle(TabsAndIndentsStyle.class))
119+
t = (JavaSourceFile) new NormalizeTabsOrSpacesVisitor<>(Optional.ofNullable(cu.getStyle(TabsAndIndentsStyle.class))
120120
.orElse(IntelliJ.tabsAndIndents()), stopAfter)
121121
.visit(t, p);
122122

123-
t = (JavaSourceFile) new TabsAndIndentsVisitor<>(Optional.ofNullable(((SourceFile) cu).getStyle(TabsAndIndentsStyle.class))
123+
t = (JavaSourceFile) new TabsAndIndentsVisitor<>(Optional.ofNullable(cu.getStyle(TabsAndIndentsStyle.class))
124124
.orElse(IntelliJ.tabsAndIndents()), stopAfter)
125125
.visit(t, p);
126126

‎rewrite-java/src/main/java/org/openrewrite/java/format/Spaces.java‎

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
import org.openrewrite.java.tree.J;
2626
import org.openrewrite.java.tree.JavaSourceFile;
2727

28-
import static java.util.Objects.requireNonNull;
29-
3028
public class Spaces extends Recipe {
3129

3230
@Override
@@ -41,28 +39,26 @@ public String getDescription() {
4139

4240
@Override
4341
public TreeVisitor<?, ExecutionContext> getVisitor() {
44-
return new SpacesFromCompilationUnitStyle();
45-
}
46-
47-
private static class SpacesFromCompilationUnitStyle extends JavaIsoVisitor<ExecutionContext> {
48-
@Override
49-
public boolean isAcceptable(SourceFile sourceFile, ExecutionContext ctx) {
50-
return sourceFile instanceof J.CompilationUnit;
51-
}
42+
return new JavaIsoVisitor<ExecutionContext>() {
43+
@Override
44+
public boolean isAcceptable(SourceFile sourceFile, ExecutionContext ctx) {
45+
return sourceFile instanceof J.CompilationUnit;
46+
}
5247

53-
@Override
54-
public J visit(@Nullable Tree tree, ExecutionContext ctx) {
55-
if (tree instanceof JavaSourceFile) {
56-
JavaSourceFile cu = (JavaSourceFile) requireNonNull(tree);
57-
SpacesStyle style = ((SourceFile) cu).getStyle(SpacesStyle.class);
58-
if (style == null) {
59-
style = IntelliJ.spaces();
48+
@Override
49+
public @Nullable J visit(@Nullable Tree tree, ExecutionContext ctx) {
50+
if (tree instanceof JavaSourceFile) {
51+
JavaSourceFile cu = (JavaSourceFile) tree;
52+
SpacesStyle style = cu.getStyle(SpacesStyle.class);
53+
if (style == null) {
54+
style = IntelliJ.spaces();
55+
}
56+
return new SpacesVisitor<>(style, cu.getStyle(EmptyForInitializerPadStyle.class),
57+
cu.getStyle(EmptyForIteratorPadStyle.class)).visit(cu, ctx);
6058
}
61-
doAfterVisit(new SpacesVisitor<>(style, ((SourceFile) cu).getStyle(EmptyForInitializerPadStyle.class),
62-
((SourceFile) cu).getStyle(EmptyForIteratorPadStyle.class)));
59+
return super.visit(tree, ctx);
6360
}
64-
return super.visit(tree, ctx);
65-
}
61+
};
6662
}
6763

6864
public static <J2 extends J> J2 formatSpaces(J j, Cursor cursor) {

0 commit comments

Comments
 (0)