Formatter improvements (comments and empty bodies).

pkg/analyzer/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/src/generated/java_core.dart' show CharSequence;
 import 'package:analyzer/src/generated/scanner.dart';
 import 'package:analyzer/src/services/formatter_impl.dart';
 import 'package:analyzer/src/services/writer.dart';
@@ skipping 518 matching lines @@
           'class A {\n'
           '}\n'
           '\n'
           '/// ... and\n'
           '\n'
           '/// Dangling ones too\n'
           'int x;\n'
         );
     });
 
+    test('CU - comments (8)', () {
+      expectCUFormatsTo(
+          'var x /* X */, y;\n',
+          'var x /* X */, y;\n'
+      );
+    });
+
+    test('CU - comments (9)', () {
+      expectCUFormatsTo(
+          'main() {\n'
+          '  foo(1 /* bang */, 2);\n'
+          '}\n'
+          'foo(x, y) => null;\n',
+          'main() {\n'
+          '  foo(1 /* bang */, 2);\n'
+          '}\n'
+          'foo(x, y) => null;\n'
+      );
+    });
+
+    test('CU - comments (10)', () {

[Brian Wilkerson, 2013/12/04 19:52:50]

If there isn't already, it might be good to add a test for a list with a
trailing separator, such as
  var l = [1, 2, ];

[pquitslund, 2013/12/04 21:09:10]

Good call.  I've got one of those in my list tests.  Thanks!

+      expectCUFormatsTo(
+          'var l = [1 /* bang */, 2];\n',
+          'var l = [1 /* bang */, 2];\n'
+      );
+    });
+
+    test('CU - comments (11)', () {
+      expectCUFormatsTo(
+          'var m = {1: 2 /* bang */, 3: 4};\n',
+          'var m = {1: 2 /* bang */, 3: 4};\n'
+      );
+    });
+
     test('CU - EOF nl', () {
       expectCUFormatsTo(
           'var x = 1;',
           'var x = 1;\n'
       );
     });
 
     test('CU - constructor', () {
       expectCUFormatsTo(
           'class A {\n'
@@ skipping 155 matching lines @@
         '  case "apple":\n'
         '    print("delish");\n'
         '    break;\n'
         '  case "fig":\n'
         '    print("bleh");\n'
         '    break;\n'
         '}'
       );
     });
 
+    test('stmt (empty while body)', () {
+      expectStmtFormatsTo(
+        'while (true);',
+        'while (true);'
+      );
+    });
+
+    test('stmt (empty for body)', () {
+      expectStmtFormatsTo(
+        'for ( ; ; );',
+        'for ( ; ; );'
+      );
+    });
+
     test('stmt (cascades)', () {
       expectStmtFormatsTo(
         '"foo"\n'
         '..toString()\n'
         '..toString();',
         '"foo"\n'
         '    ..toString()\n'
         '    ..toString();'
       );
     });
@@ skipping 343 matching lines @@
     expect(() => new TokenStreamComparator(null, t1, t2).verifyEquals(),
     throwsA(new isInstanceOf<FormatterException>()));
 
 expectCUFormatsTo(src, expected, {transforms: true}) =>
     expect(formatCU(src, options: new FormatterOptions(
         codeTransforms: transforms)).source, equals(expected));
 
 expectStmtFormatsTo(src, expected, {transforms: true}) =>
     expect(formatStatement(src, options:
       new FormatterOptions(codeTransforms: transforms)), equals(expected));