Formatter checkpoint.

pkg/analyzer_experimental/test/services/formatter_test.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:unittest/unittest.dart';
 
-import 'package:analyzer_experimental/src/generated/ast.dart';
 import 'package:analyzer_experimental/src/generated/scanner.dart';
-import 'package:analyzer_experimental/src/services/formatter.dart';
 import 'package:analyzer_experimental/src/services/formatter_impl.dart';
 import 'package:analyzer_experimental/src/services/writer.dart';
 
 main() {
 
   /// Formatter tests
   group('formatter', () {
 
     test('failed parse', () {
       var formatter = new CodeFormatter();
@@ skipping 30 matching lines @@
 
     test('CU (4)', () {
       expectCUFormatsTo(
           ' class A {\n'
           '}',
           'class A {\n'
           '}\n'
         );
     });
 
+    test('CU w/class decl comment', () {
+      expectCUFormatsTo(
+          'import "foo";\n\n'
+          '//Killer class\n'
+          'class A {\n'
+          '}',
+          'import "foo";\n\n'
+          '//Killer class\n'
+          'class A {\n'
+          '}\n'
+        );
+    });
+
+
     test('CU (method indent)', () {
       expectCUFormatsTo(
           'class A {\n'
           'void x(){\n'
           '}\n'
           '}',
           'class A {\n'
           '  void x() {\n'
           '  }\n'
           '}\n'
@@ skipping 22 matching lines @@
           '  int x() => 42 + 3;\n'
           '}\n'
         );
     });
 
     test('CU (method indent - 4)', () {
       expectCUFormatsTo(
           'class A {\n'
           ' int x() { \n'
           'if (true) {return 42;\n'
-          '} else { return false; }\n'
+          '} else { return 13; }\n'
           '   }'
           '}',
           'class A {\n'
           '  int x() {\n'
           '    if (true) {\n'
           '      return 42;\n'
           '    } else {\n'
-          '      return false;\n'
+          '      return 13;\n'
           '    }\n'
           '  }\n'
           '}\n'
         );
     });
 
     test('CU (multiple members)', () {
       expectCUFormatsTo(
           'class A {\n'
           '}\n'
           'class B {\n'
           '}\n',
           'class A {\n'
           '}\n'
           'class B {\n'
           '}\n'
         );
     });
 
     test('CU (multiple members w/blanks)', () {
       expectCUFormatsTo(
           'class A {\n'
           '}\n\n'
-          'class B {\n'
+          'class B {\n\n\n'
+          '  int b() => 42;\n\n'
+          '  int c() => b();\n\n'
           '}\n',
           'class A {\n'
           '}\n\n'
-          'class B {\n'
+          'class B {\n\n\n'
+          '  int b() => 42;\n\n'
+          '  int c() => b();\n\n'
           '}\n'
         );
     });
-    
 
     test('stmt', () {
       expectStmtFormatsTo(
          'if (true){\n'
          'if (true){\n'
          'if (true){\n'
          'return true;\n'
          '} else{\n'
          'return false;\n'
          '}\n'
          '}\n'
          '}else{\n'
          'return false;\n'
          '}',
          'if (true) {\n'
          '  if (true) {\n'
          '    if (true) {\n'
          '      return true;\n'
          '    } else {\n'
          '      return false;\n'
          '    }\n'
          '  }\n'
          '} else {\n'
          '  return false;\n'
          '}'
         );
     });
 
-
     test('initialIndent', () {
       var formatter = new CodeFormatter(
           new FormatterOptions(initialIndentationLevel: 2));
       var formattedSource = formatter.format(CodeKind.STATEMENT, 'var x;');
       expect(formattedSource, startsWith('    '));
     });
 
   });
 
 
@@ skipping 21 matching lines @@
       line.addToken(new LineToken('foo'));
       expect(line.toString(), equals('foo'));
     });
 
     test('addToken (2)', () {
       var line = new Line(indent: 1);
       line.addToken(new LineToken('foo'));
       expect(line.toString(), equals('  foo'));
     });
 
+    test('isWhitespace', () {
+      var line = new Line(indent: 1);
+      expect(line.isWhitespace(), isTrue);
+    });
+
   });
 
 
   /// Writer tests
   group('writer', () {
 
     test('basic print', () {
       var writer = new SourceWriter();
       writer.print('foo');
       writer.print(' ');
       writer.print('bar');
       expect(writer.toString(), equals('foo bar'));
     });
 
     test('newline', () {
       var writer = new SourceWriter();
       writer.print('foo');
       writer.newline();
       expect(writer.toString(), equals('foo\n'));
     });
 
+    test('newline trims whitespace', () {
+      var writer = new SourceWriter(indentCount:2);
+      writer.newline();
+      expect(writer.toString(), equals('\n'));
+    });
+
     test('basic print (with indents)', () {
       var writer = new SourceWriter();
       writer.print('foo');
       writer.indent();
       writer.newline();
       writer.print('bar');
       writer.unindent();
       writer.newline();
       writer.print('baz');
       expect(writer.toString(), equals('foo\n  bar\nbaz'));
@@ skipping 49 matching lines @@
 String formatCU(src, {options: const FormatterOptions()}) =>
     new CodeFormatter(options).format(CodeKind.COMPILATION_UNIT, src);
 
 String formatStatement(src, {options: const FormatterOptions()}) =>
     new CodeFormatter(options).format(CodeKind.STATEMENT, src);
 
 expectCUFormatsTo(src, expected) => expect(formatCU(src), equals(expected));
 
 expectStmtFormatsTo(src, expected) => expect(formatStatement(src),
     equals(expected));