Skip to content

Commit 72e0792

Browse files
kmccarpkmccarp
authored
Revert changes made to add method wrapping style (#6121)
* Revert "Fix NPE and NoSuchMethodError (#6120)" This reverts commit bc68beb. * Revert "Added method wrapping style (#6106)" This reverts commit 485cffc.
1 parent bc68beb commit 72e0792

File tree

9 files changed

+60
-3117
lines changed

9 files changed

+60
-3117
lines changed

‎rewrite-java-test/src/test/java/org/openrewrite/java/format/WrappingAndBracesTest.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2025 the original author or authors.
2+
* Copyright 2020 the original author or authors.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -28,12 +28,12 @@
2828
import org.openrewrite.test.RewriteTest;
2929
import org.openrewrite.test.SourceSpec;
3030

31-
import java.util.Arrays;
3231
import java.util.List;
3332
import java.util.function.Consumer;
3433
import java.util.function.UnaryOperator;
3534

36-
import static java.util.Collections.*;
35+
import static java.util.Collections.emptySet;
36+
import static java.util.Collections.singletonList;
3737
import static org.openrewrite.java.Assertions.java;
3838
import static org.openrewrite.style.LineWrapSetting.DoNotWrap;
3939
import static org.openrewrite.style.LineWrapSetting.WrapAlways;
@@ -45,7 +45,6 @@ class WrappingAndBracesTest implements RewriteTest {
4545
public void defaults(RecipeSpec spec) {
4646
spec.recipe(toRecipe(() -> new WrappingAndBracesVisitor<>(new WrappingAndBracesStyle(
4747
new WrappingAndBracesStyle.IfStatement(false),
48-
new WrappingAndBracesStyle.ChainedMethodCalls(WrapAlways, Arrays.asList("builder", "newBuilder")),
4948
new WrappingAndBracesStyle.Annotations(WrapAlways),
5049
new WrappingAndBracesStyle.Annotations(WrapAlways),
5150
new WrappingAndBracesStyle.Annotations(WrapAlways),
@@ -70,7 +69,7 @@ public class Test {
7069
"""
7170
public class Test {
7271
{
73-
int n = 0;
72+
int n = 0;
7473
n++;
7574
}
7675
}
@@ -926,7 +925,6 @@ void annotationWrappingWithNulls() {
926925
rewriteRun(spec ->
927926
spec.recipe(toRecipe(() -> new WrappingAndBracesVisitor<>(new WrappingAndBracesStyle(
928927
new WrappingAndBracesStyle.IfStatement(false),
929-
new WrappingAndBracesStyle.ChainedMethodCalls(DoNotWrap, emptyList()),
930928
null,
931929
null,
932930
null,

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

Lines changed: 43 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -24,30 +24,23 @@
2424
import org.openrewrite.java.tree.J;
2525
import org.openrewrite.java.tree.JavaSourceFile;
2626
import org.openrewrite.style.GeneralFormatStyle;
27-
import org.openrewrite.style.NamedStyles;
2827
import org.openrewrite.style.Style;
2928

30-
import java.util.Arrays;
31-
import java.util.List;
32-
import java.util.function.Supplier;
29+
import java.util.Optional;
3330

3431
import static java.util.Objects.requireNonNull;
35-
import static java.util.stream.Collectors.toList;
3632
import static org.openrewrite.java.format.AutodetectGeneralFormatStyle.autodetectGeneralFormatStyle;
3733

3834
public class AutoFormatVisitor<P> extends JavaIsoVisitor<P> {
3935
@Nullable
4036
private final Tree stopAfter;
4137

42-
private final List<NamedStyles> styles;
43-
4438
public AutoFormatVisitor() {
4539
this(null);
4640
}
4741

48-
public AutoFormatVisitor(@Nullable Tree stopAfter, NamedStyles ... style) {
42+
public AutoFormatVisitor(@Nullable Tree stopAfter) {
4943
this.stopAfter = stopAfter;
50-
this.styles = Arrays.stream(style).collect(toList());
5144
}
5245

5346
@Override
@@ -57,40 +50,41 @@ public boolean isAcceptable(SourceFile sourceFile, P p) {
5750

5851
@Override
5952
public J visit(@Nullable Tree tree, P p, Cursor cursor) {
60-
JavaSourceFile cu = (tree instanceof JavaSourceFile) ? (JavaSourceFile) tree : cursor.firstEnclosingOrThrow(JavaSourceFile.class);
61-
if (tree == null) {
62-
tree = cursor.getValue();
63-
}
53+
JavaSourceFile cu = (tree instanceof JavaSourceFile) ?
54+
(JavaSourceFile) tree :
55+
cursor.firstEnclosingOrThrow(JavaSourceFile.class);
6456

65-
J t = new NormalizeFormatVisitor<>(stopAfter)
66-
.visitNonNull(tree, p, cursor.fork());
57+
J t = new NormalizeFormatVisitor<>(stopAfter).visit(tree, p, cursor.fork());
6758

68-
t = new MinimumViableSpacingVisitor<>(stopAfter)
69-
.visitNonNull(t, p, cursor.fork());
59+
t = new MinimumViableSpacingVisitor<>(stopAfter).visit(t, p, cursor.fork());
7060

71-
t = new BlankLinesVisitor<>(getStyle(BlankLinesStyle.class, cu, IntelliJ::blankLines), stopAfter)
72-
.visitNonNull(t, p, cursor.fork());
61+
t = new BlankLinesVisitor<>(Style.from(BlankLinesStyle.class, cu, IntelliJ::blankLines), stopAfter)
62+
.visit(t, p, cursor.fork());
7363

74-
t = new WrappingAndBracesVisitor<>(getStyle(WrappingAndBracesStyle.class, cu, IntelliJ::wrappingAndBraces), stopAfter)
75-
.visitNonNull(t, p, cursor.fork());
64+
t = new WrappingAndBracesVisitor<>(Style.from(WrappingAndBracesStyle.class, cu, IntelliJ::wrappingAndBraces), stopAfter)
65+
.visit(t, p, cursor.fork());
7666

77-
SpacesStyle spacesStyle = getStyle(SpacesStyle.class, cu, IntelliJ::spaces);
78-
TabsAndIndentsStyle tabsAndIndentsStyle = getStyle(TabsAndIndentsStyle.class, cu, IntelliJ::tabsAndIndents);
67+
SpacesStyle spacesStyle = Style.from(SpacesStyle.class, cu, IntelliJ::spaces);
68+
TabsAndIndentsStyle tabsAndIndentsStyle = Style.from(TabsAndIndentsStyle.class, cu, IntelliJ::tabsAndIndents);
7969

80-
t = new SpacesVisitor<>(spacesStyle, getStyle(EmptyForInitializerPadStyle.class, cu), getStyle(EmptyForIteratorPadStyle.class, cu), stopAfter)
81-
.visitNonNull(t, p, cursor.fork());
70+
t = new SpacesVisitor<>(
71+
spacesStyle,
72+
Style.from(EmptyForInitializerPadStyle.class, cu),
73+
Style.from(EmptyForIteratorPadStyle.class, cu),
74+
stopAfter
75+
).visit(t, p, cursor.fork());
8276

8377
t = new NormalizeTabsOrSpacesVisitor<>(tabsAndIndentsStyle, stopAfter)
84-
.visitNonNull(t, p, cursor.fork());
78+
.visit(t, p, cursor.fork());
8579

8680
t = new TabsAndIndentsVisitor<>(tabsAndIndentsStyle, spacesStyle, stopAfter)
87-
.visitNonNull(t, p, cursor.fork());
81+
.visit(t, p, cursor.fork());
8882

89-
t = new NormalizeLineBreaksVisitor<>(getStyle(GeneralFormatStyle.class, cu, () -> autodetectGeneralFormatStyle(cu)), stopAfter)
90-
.visitNonNull(t, p, cursor.fork());
83+
t = new NormalizeLineBreaksVisitor<>(Optional.ofNullable(Style.from(GeneralFormatStyle.class, cu))
84+
.orElse(autodetectGeneralFormatStyle(cu)), stopAfter)
85+
.visit(t, p, cursor.fork());
9186

92-
return new RemoveTrailingWhitespaceVisitor<>(stopAfter)
93-
.visitNonNull(t, p, cursor.fork());
87+
return new RemoveTrailingWhitespaceVisitor<>(stopAfter).visit(t, p, cursor.fork());
9488
}
9589

9690
@Override
@@ -103,43 +97,32 @@ public J visit(@Nullable Tree tree, P p) {
10397
if (!(cu instanceof J.CompilationUnit)) {
10498
return cu;
10599
}
106-
JavaSourceFile t = (JavaSourceFile) new RemoveTrailingWhitespaceVisitor<>(stopAfter)
107-
.visitNonNull(cu, p);
100+
JavaSourceFile t = (JavaSourceFile) new RemoveTrailingWhitespaceVisitor<>(stopAfter).visit(cu, p);
108101

109-
t = (JavaSourceFile) new BlankLinesVisitor<>(getStyle(BlankLinesStyle.class, cu, IntelliJ::blankLines), stopAfter)
110-
.visitNonNull(t, p);
102+
t = (JavaSourceFile) new BlankLinesVisitor<>(Style.from(BlankLinesStyle.class, cu, IntelliJ::blankLines), stopAfter)
103+
.visit(t, p);
111104

112-
SpacesStyle spacesStyle = getStyle(SpacesStyle.class, cu, IntelliJ::spaces);
113-
TabsAndIndentsStyle tabsAndIndentsStyle = getStyle(TabsAndIndentsStyle.class, cu, IntelliJ::tabsAndIndents);
105+
SpacesStyle spacesStyle = Optional.ofNullable(Style.from(SpacesStyle.class, cu)).orElse(IntelliJ.spaces());
106+
TabsAndIndentsStyle tabsAndIndentsStyle = Style.from(TabsAndIndentsStyle.class, cu, IntelliJ::tabsAndIndents);
114107

115-
t = (JavaSourceFile) new SpacesVisitor<P>(spacesStyle, getStyle(EmptyForInitializerPadStyle.class, cu), getStyle(EmptyForIteratorPadStyle.class, cu), stopAfter)
116-
.visitNonNull(t, p);
108+
t = (JavaSourceFile) new SpacesVisitor<P>(spacesStyle,
109+
Style.from(EmptyForInitializerPadStyle.class, cu),
110+
Style.from(EmptyForIteratorPadStyle.class, cu),
111+
stopAfter)
112+
.visit(t, p);
117113

118-
t = (JavaSourceFile) new WrappingAndBracesVisitor<>(getStyle(WrappingAndBracesStyle.class, cu, IntelliJ::wrappingAndBraces), stopAfter)
119-
.visitNonNull(t, p);
114+
t = (JavaSourceFile) new WrappingAndBracesVisitor<>(Style.from(WrappingAndBracesStyle.class, cu, IntelliJ::wrappingAndBraces), stopAfter)
115+
.visit(t, p);
120116

121117
t = (JavaSourceFile) new NormalizeTabsOrSpacesVisitor<>(tabsAndIndentsStyle, stopAfter)
122-
.visitNonNull(t, p);
118+
.visit(t, p);
123119

124-
return new TabsAndIndentsVisitor<>(tabsAndIndentsStyle, spacesStyle, stopAfter)
125-
.visitNonNull(t, p);
126-
}
127-
return (J) tree;
128-
}
120+
t = (JavaSourceFile) new TabsAndIndentsVisitor<>(tabsAndIndentsStyle, spacesStyle, stopAfter)
121+
.visit(t, p);
129122

130-
private <S extends Style> @Nullable S getStyle(Class<S> styleClass, JavaSourceFile sourceFile) {
131-
S style = NamedStyles.merge(styleClass, styles);
132-
if (style != null) {
133-
return style;
123+
assert t != null;
124+
return t;
134125
}
135-
return Style.from(styleClass, sourceFile);
136-
}
137-
138-
private <S extends Style> S getStyle(Class<S> styleClass, JavaSourceFile sourceFile, Supplier<S> defaultStyle) {
139-
S style = NamedStyles.merge(styleClass, styles);
140-
if (style != null) {
141-
return style;
142-
}
143-
return Style.from(styleClass, sourceFile, defaultStyle);
126+
return (J) tree;
144127
}
145128
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, P
149149
}
150150
first = false;
151151
}
152-
if (!first && m.getName().getPrefix().getWhitespace().isEmpty()) {
152+
if (!first) {
153153
m = m.withName(m.getName().withPrefix(m.getName().getPrefix().withWhitespace(" ")));
154154
}
155155

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

Lines changed: 0 additions & 100 deletions
This file was deleted.

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

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@
2121
import org.openrewrite.internal.ListUtils;
2222
import org.openrewrite.java.JavaIsoVisitor;
2323
import org.openrewrite.java.style.WrappingAndBracesStyle;
24-
import org.openrewrite.java.tree.*;
24+
import org.openrewrite.java.tree.J;
25+
import org.openrewrite.java.tree.JavaSourceFile;
26+
import org.openrewrite.java.tree.Space;
27+
import org.openrewrite.java.tree.Statement;
2528

2629
import java.util.List;
27-
import java.util.function.Function;
2830

2931
import static java.util.Objects.requireNonNull;
3032
import static org.openrewrite.internal.StringUtils.hasLineBreak;
@@ -53,7 +55,9 @@ public Statement visitStatement(Statement statement, P p) {
5355
Tree parentTree = getCursor().getParentTreeCursor().getValue();
5456
if (parentTree instanceof J.Block && !(j instanceof J.EnumValueSet)) {
5557
// for `J.EnumValueSet` the prefix is on the enum constants
56-
j = j.withPrefix(withNewline(j.getPrefix()));
58+
if (!hasLineBreak(j.getPrefix().getWhitespace())) {
59+
j = j.withPrefix(withNewline(j.getPrefix()));
60+
}
5761
}
5862

5963
return j;
@@ -132,12 +136,6 @@ public J.If.Else visitElse(J.If.Else else_, P p) {
132136
return e;
133137
}
134138

135-
@Override
136-
public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, P p) {
137-
method = (J.MethodInvocation) new WrapMethodChains<>(style).visit(method, p, getCursor().getParentTreeCursor());
138-
return super.visitMethodInvocation(method, p);
139-
}
140-
141139
@Override
142140
public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, P p) {
143141
J.ClassDeclaration j = super.visitClassDeclaration(classDecl, p);
@@ -222,10 +220,9 @@ private Space wrapElement(Space prefix, String whitespace, WrappingAndBracesStyl
222220

223221
private Space withNewline(Space prefix) {
224222
if (prefix.getComments().isEmpty()) {
225-
return prefix.withWhitespace((hasLineBreak(prefix.getWhitespace()) ? prefix.getWhitespace() : "\n"));
223+
return prefix.withWhitespace((hasLineBreak(prefix.getWhitespace()) ? "" : "\n") + prefix.getWhitespace());
226224
} else if (prefix.getComments().get(prefix.getComments().size() - 1).isMultiline()) {
227-
return prefix.withComments(ListUtils.mapLast(prefix.getComments(), (Function<Comment, Comment>) c ->
228-
c.withSuffix((hasLineBreak(c.getSuffix()) ? c.getSuffix() : "\n"))));
225+
return prefix.withComments(ListUtils.mapLast(prefix.getComments(), c -> requireNonNull(c).withSuffix("\n")));
229226
}
230227
return prefix;
231228
}

0 commit comments

Comments
 (0)