Formatter comment-handling improvements.

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/scanner.dart';
 import 'package:analyzer_experimental/src/services/formatter_impl.dart';
 import 'package:analyzer_experimental/src/services/writer.dart';
 
@@ skipping 58 matching lines @@
     });
 
     test('CU - EOL comments', () {
       expectCUFormatsTo(
           '//comment one\n\n'
           '//comment two\n\n',
           '//comment one\n\n'
           '//comment two\n\n'
       );
       expectCUFormatsTo(
+          'var x;   //x\n',
+          'var x; //x\n'
+      );
+      expectCUFormatsTo(
           'library foo;\n'
           '\n'
           '//comment one\n'
           '\n'
           'class C {\n'
           '}\n',
           'library foo;\n'
           '\n'
           '//comment one\n'
           '\n'
@@ skipping 233 matching lines @@
     });
 
     test('CU - Block comments', () {
       expectCUFormatsTo(
           '/** Old school class comment */\n'
           'class C {\n'
           '  /** Foo! */ int foo() => 42;\n'
           '}\n',
           '/** Old school class comment */\n'
           'class C {\n'
-          '  /** Foo! */ int foo() => 42;\n'
+          '  /** Foo! */\n'
+          '  int foo() => 42;\n'
           '}\n'
       );
       expectCUFormatsTo(
           'library foo;\n'
           'class C /* is cool */ {\n'
           '  /* int */ foo() => 42;\n'
           '}\n',
           'library foo;\n'
           'class C /* is cool */ {\n'
           '  /* int */ foo() => 42;\n'
@@ skipping 56 matching lines @@
           '/// Copyright info\n'
           '\n'
           'library foo;\n'
           '/// Class comment\n'
           '//TODO: implement\n'
           'class C {\n'
           '}\n'
       );
     });
     
+    test('CU - mixed comments', () {
+      expectCUFormatsTo(
+          'library foo;\n'
+          '\n'
+          '\n'
+          '/* Comment 1 */\n'
+          '\n'
+          '// Comment 2\n'
+          '\n'
+          '/* Comment 3 */',
+          'library foo;\n'
+          '\n'
+          '\n'
+          '/* Comment 1 */\n'
+          '\n'
+          '// Comment 2\n'
+          '\n'
+          '/* Comment 3 */'
+        );
+    });
+    
+    test('CU - comments (EOF)', () {
+      expectCUFormatsTo(
+          'library foo; //zamm',
+          'library foo; //zamm\n' //<-- note extra NEWLINE
+        );
+    });  
+    
+    test('CU - comments (0)', () {
+      expectCUFormatsTo(
+          'library foo; //zamm\n'
+          '\n'
+          'class A {\n'
+          '}\n',
+          'library foo; //zamm\n'
+          '\n'
+          'class A {\n'
+          '}\n'
+        );
+    });
+
+    test('CU - comments (1)', () {
+      expectCUFormatsTo(
+          '/* foo */ /* bar */\n',
+          '/* foo */ /* bar */\n'
+      );
+    });
+    
+    test('CU - comments (2)', () {
+      expectCUFormatsTo(
+          '/** foo */ /** bar */\n',
+          '/** foo */\n' 
+          '/** bar */\n'
+      );
+    });
+
+    test('CU - comments (3)', () {
+      expectCUFormatsTo(
+          'var x;   //x\n',
+          'var x; //x\n'
+      );
+    });
+
+    test('CU - comments (4)', () {
+      expectCUFormatsTo(
+          'class X { //X!\n'
+          '}',
+          'class X { //X!\n'
+          '}'
+      );
+    });
+    
+    test('CU - comments (5)', () {
+      expectCUFormatsTo(
+          '//comment one\n\n'
+          '//comment two\n\n',
+          '//comment one\n\n'
+          '//comment two\n\n'
+      );
+    });    
+    
+    test('CU - comments (6)', () {
+      expectCUFormatsTo(
+          'var x;   //x\n',
+          'var x; //x\n'
+      );
+    });    
+
+    test('CU - comments (6)', () {
+      expectCUFormatsTo(
+          'var /* int */ x; //x\n',
+          'var /* int */ x; //x\n'
+      );
+    });    
+    
+    test('CU - comments (7)', () {
+      expectCUFormatsTo(
+          'library foo;\n'
+          '\n'
+          '/// Docs\n'
+          '/// spanning\n'
+          '/// lines.\n'
+          'class A {\n'
+          '}\n'
+          '\n'
+          '/// ... and\n'
+          '\n'
+          '/// Dangling ones too\n'
+          'int x;\n',
+          'library foo;\n'
+          '\n'
+          '/// Docs\n'
+          '/// spanning\n'
+          '/// lines.\n'
+          'class A {\n'
+          '}\n'
+          '\n'
+          '/// ... and\n'
+          '\n'
+          '/// Dangling ones too\n'
+          'int x;\n'
+        );
+    });
+    
     
     test('CU - constructor', () {
       expectCUFormatsTo(
           'class A {\n'
           '  const _a;\n'
           '  A();\n'
           '  int a() => _a;\n'
           '}\n',
           'class A {\n'
           '  const _a;\n'
@@ skipping 327 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));