@@ -11,37 +11,35 @@ part of code_builder;
1111/// This is the _recommended_ output (but not required) when comparing ASTs
1212/// to expected golden files/text blobs.
1313String prettyToSource (AstNode astNode) {
14- var writer = new PrintStringWriter ();
15- var visitor = new _PrettyToSourceVisitor (writer );
14+ var buffer = new StringBuffer ();
15+ var visitor = new _PrettyToSourceVisitor (buffer );
1616 astNode.accept (visitor);
17- return dartfmt (writer .toString ());
17+ return dartfmt (buffer .toString ());
1818}
1919
2020// TODO(matanl): Remove copied-pasted methods when API becomes available.
2121// https://github.com/dart-lang/sdk/issues/27169
2222class _PrettyToSourceVisitor extends ToSourceVisitor {
23- // Removed in a new version of the analyzer, but due to dartfmt it's not
24- // possible to refer to the newest analyzer and use dartfmt.
2523 // https://github.com/dart-lang/sdk/issues/27301
26- final PrintStringWriter _writer ;
24+ final StringBuffer _buffer ;
2725
28- _PrettyToSourceVisitor (PrintStringWriter writer )
29- : _writer = writer ,
30- super (writer );
26+ _PrettyToSourceVisitor (StringBuffer buffer )
27+ : _buffer = buffer ,
28+ super (buffer );
3129
3230 @override
3331 Object visitClassDeclaration (ClassDeclaration node) {
3432 _visitNodeListWithSeparatorAndSuffix (node.metadata, " " , " " );
3533 _visitTokenWithSuffix (node.abstractKeyword, " " );
36- _writer. print ("class " );
34+ _buffer. write ("class " );
3735 _visitNode (node.name);
3836 _visitNode (node.typeParameters);
3937 _visitNodeWithPrefix (" " , node.extendsClause);
4038 _visitNodeWithPrefix (" " , node.withClause);
4139 _visitNodeWithPrefix (" " , node.implementsClause);
42- _writer. print (" {" );
40+ _buffer. write (" {" );
4341 _visitNodeListWithSeparator (node.members, "\n\n " );
44- _writer. print ("}" );
42+ _buffer. write ("}" );
4543 return null ;
4644 }
4745
@@ -58,7 +56,7 @@ class _PrettyToSourceVisitor extends ToSourceVisitor {
5856 int size = nodes.length;
5957 for (int i = 0 ; i < size; i++ ) {
6058 if (i > 0 ) {
61- _writer. print (separator);
59+ _buffer. write (separator);
6260 }
6361 nodes[i].accept (this );
6462 }
@@ -74,11 +72,11 @@ class _PrettyToSourceVisitor extends ToSourceVisitor {
7472 if (size > 0 ) {
7573 for (int i = 0 ; i < size; i++ ) {
7674 if (i > 0 ) {
77- _writer. print (separator);
75+ _buffer. write (separator);
7876 }
7977 nodes[i].accept (this );
8078 }
81- _writer. print (suffix);
79+ _buffer. write (suffix);
8280 }
8381 }
8482 }
@@ -87,7 +85,7 @@ class _PrettyToSourceVisitor extends ToSourceVisitor {
8785 // is non-`null`.
8886 void _visitNodeWithPrefix (String prefix, AstNode node) {
8987 if (node != null ) {
90- _writer. print (prefix);
88+ _buffer. write (prefix);
9189 node.accept (this );
9290 }
9391 }
@@ -96,8 +94,8 @@ class _PrettyToSourceVisitor extends ToSourceVisitor {
9694 // is non-`null`.
9795 void _visitTokenWithSuffix (Token token, String suffix) {
9896 if (token != null ) {
99- _writer. print (token.lexeme);
100- _writer. print (suffix);
97+ _buffer. write (token.lexeme);
98+ _buffer. write (suffix);
10199 }
102100 }
103101}
0 commit comments