|
25 | 25 | import com.google.errorprone.annotations.Immutable; |
26 | 26 | import com.google.googlejavaformat.CommentsHelper; |
27 | 27 | import com.google.googlejavaformat.Doc; |
28 | | -import com.google.googlejavaformat.DocBuilder; |
29 | 28 | import com.google.googlejavaformat.FormattingError; |
30 | 29 | import com.google.googlejavaformat.Newlines; |
31 | 30 | import com.google.googlejavaformat.Op; |
32 | | -import com.google.googlejavaformat.OpsBuilder; |
| 31 | +import com.google.googlejavaformat.layout.LayoutBuilder; |
| 32 | +import com.google.googlejavaformat.layout.LayoutSolver; |
33 | 33 | import com.sun.tools.javac.tree.JCTree.JCCompilationUnit; |
34 | 34 | import com.sun.tools.javac.util.Context; |
35 | 35 | import java.io.IOException; |
@@ -113,22 +113,21 @@ static void format(final JavaInput javaInput, JavaOutput javaOutput, JavaFormatt |
113 | 113 | if (!errorDiagnostics.isEmpty()) { |
114 | 114 | throw FormatterException.fromJavacDiagnostics(errorDiagnostics); |
115 | 115 | } |
116 | | - OpsBuilder builder = new OpsBuilder(javaInput, javaOutput); |
| 116 | + LayoutBuilder builder = new LayoutBuilder(javaInput, javaOutput); |
117 | 117 | ImmutableSet.Builder<Integer> markdownJavadocPositions = ImmutableSet.builder(); |
118 | 118 | // Output the compilation unit. |
119 | 119 | JavaInputAstVisitor visitor = |
120 | 120 | new JavaInputAstVisitor(builder, options.indentationMultiplier(), markdownJavadocPositions); |
121 | 121 | visitor.scan(unit, null); |
122 | 122 | builder.sync(javaInput.getText().length()); |
123 | 123 | builder.drain(); |
124 | | - Doc doc = new DocBuilder().withOps(builder.build()).build(); |
| 124 | + var doc = builder.build(); |
125 | 125 | CommentsHelper commentsHelper = |
126 | 126 | new JavaCommentsHelper( |
127 | 127 | Newlines.guessLineSeparator(javaInput.getText()), |
128 | 128 | options, |
129 | 129 | markdownJavadocPositions.build()); |
130 | | - doc.computeBreaks(commentsHelper, options.maxLineLength(), new Doc.State(+0, 0)); |
131 | | - doc.write(javaOutput); |
| 130 | + LayoutSolver.format(doc, options.maxLineLength(), javaOutput, commentsHelper); |
132 | 131 | javaOutput.flush(); |
133 | 132 | } |
134 | 133 |
|
|
0 commit comments