Improve wrapping during formatting.

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.
 
 library formatter_test;
 
 import 'dart:io';
 
 import 'package:path/path.dart';
 import 'package:unittest/unittest.dart';
@@ skipping 24 matching lines @@
     });
   });
 
   /// Data-driven Style Guide acceptance tests
   group('style_guide_tests.data', () {
     runTests('style_guide_tests.data', (input, expectedOutput) {
       expectCUFormatsTo(input, expectedOutput);
     });
   });
 
+  /// Data-driven wrapping tests
+  group('wrap_tests.data', () {
+    runTests('wrap_tests.data', (input, expectedOutput) {
+      expectCUFormatsTo(input, expectedOutput);
+    });
+  });
+
   /// Formatter tests
   group('formatter', () {
 
     test('failed parse', () {
       var formatter = new CodeFormatter();
       expect(() => formatter.format(CodeKind.COMPILATION_UNIT, '~'),
                    throwsA(new isInstanceOf<FormatterException>()));
     });
 
     test('indent', () {
@@ skipping 1269 matching lines @@
 
 
 
   /// Line breaker tests
   group('linebreaker', () {
 
     List<Chunk> breakLine(Line line, int maxLength) =>
         new SimpleLineBreaker(maxLength).breakLine(line);
 
     String printLine(Line line, int maxLength) =>
-        new SimpleLineBreaker(maxLength).printLine(line);
+        new SimpleLineBreaker(
+            maxLength,
+            (n) => new List.filled(n, '  ').join()
+        ).printLine(line);
 
     Line line(List tokens) {
       var line = new Line();
       tokens.forEach((t) =>
           line.addToken(t is LineToken ? t : new LineToken(t)));
       return line;
     }
 
     expectTextsEqual(List<Chunk> chunks, List<String> texts) {
       expect(chunks.map((chunk) => chunk.toString()), orderedEquals(texts));
     }
 
     expectTokensEqual(List<LineToken> tokens, List<String> texts) {
       expect(tokens.map((token) => token.toString()), orderedEquals(texts));
     }
 
 
-    final SP_1 = new SpaceToken(1, breakWeight: 1);
+    final SP_1 = new SpaceToken(1, breakWeight: DEFAULT_SPACE_WEIGHT);
+    final SP_w1 = new SpaceToken(1, breakWeight: 1);
+    final SP_w2 = new SpaceToken(1, breakWeight: 2);
 
     // 'foo|1|bar|1|baz|1|foo|1|bar|1|baz'
     final LINE_1 = line(['foo', SP_1, 'bar', SP_1, 'baz', SP_1,
                          'foo', SP_1, 'bar', SP_1, 'baz']);
 
     // '  foo|1|bar|1|baz|1|foo|1|bar|1|baz'
     final LINE_2 = line(['  foo', SP_1, 'bar', SP_1, 'baz', SP_1,
                          'foo', SP_1, 'bar', SP_1, 'baz']);
 
     test('breakLine - 0', () {
@@ skipping 19 matching lines @@
     test('breakLine - 4', () {
       var chunks = breakLine(LINE_1, 12);
       expectTextsEqual(chunks, ['foo bar baz', 'foo bar baz']);
     });
 
     test('breakLine - 5', () {
       var chunks = breakLine(LINE_2, 16);
       expectTextsEqual(chunks, ['  foo bar baz', 'foo bar baz']);
     });
 
+    test('breakLine - use weights - 1', () {
+      var source = line(['111', SP_w2, '222', SP_w1, '333', SP_w2,
+                           '444', SP_w1, '555', SP_w2, '666']);
+      var chunks = breakLine(source, 12);
+      expectTextsEqual(chunks, ['111 222', '333 444', '555 666']);
+    });
+
     test('printLine - 1', () {
       var line = printLine(LINE_1, 1);
-      expect(line, 'foo\nbar\nbaz\nfoo\nbar\nbaz');
+      expect(line, 'foo\n    bar\n    baz\n    foo\n    bar\n    baz');
     });
 
     test('printLine - 2', () {
       var line = printLine(LINE_1, 4);
-      expect(line, 'foo\nbar\nbaz\nfoo\nbar\nbaz');
+      expect(line, 'foo\n    bar\n    baz\n    foo\n    bar\n    baz');
     });
 
     test('printLine - 3', () {
       var line = printLine(LINE_1, 8);
-      expect(line, 'foo bar\nbaz foo\nbar baz');
+      expect(line, 'foo bar\n    baz foo\n    bar baz');
     });
 
     test('printLine - 4', () {
       var line = printLine(LINE_1, 12);
-      expect(line, 'foo bar baz\nfoo bar baz');
+      expect(line, 'foo bar baz\n    foo bar baz');
+    });
+
+    test('printLine - use weight - 1', () {
+      var source = line(
+                     ['111111', SP_w2, '222222', SP_w1,
+                      '333333', SP_w2, '444444', SP_w1,
+                      '555555', SP_w2, '666666']);
+      var result = printLine(source, 20);
+      expect(result, '111111 222222\n    333333 444444\n    555555 666666');
     });
 
     test('isWhitespace', () {
       expect(isWhitespace('foo'), false);
       expect(isWhitespace('  foo'), false);
       expect(isWhitespace('foo  '), false);
       expect(isWhitespace(' foo '), false);
       expect(isWhitespace(' '), true);
       expect(isWhitespace('  '), true);
       expect(isWhitespace('\t'), true);
@@ skipping 142 matching lines @@
       input += lines[i++] + '\n';
     }
     while(++i < lines.length && !lines[i].startsWith('>>>')) {
       expectedOutput += lines[i] + '\n';
     }
     test('test - (${testIndex++})', () {
       expectClause(input, expectedOutput);
     });
   }
 }