Improve formatting of variable declarations/assignments.

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 1344 matching lines @@
     }
 
     expectTokensEqual(List<LineToken> tokens, List<String> texts) {
       expect(tokens.map((token) => token.toString()), orderedEquals(texts));
     }
 
 
     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);
+    final SP_i = new SpaceToken(1, breakWeight: SINGLE_SPACE_WEIGHT);
 
     // '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 55 matching lines @@
 
     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('printLine - use weight - initializer - success', () {
+      var source = line(
+                     ['111111', SP_i, '2222', SP_w1,
+                      '3333', SP_w1, '4444']);
+      var result = printLine(source, 20);
+      expect(result, '111111\n    2222 3333 4444');
+    });
+
+    test('printLine - use weight - initializer - rest too long', () {
+      var source = line(
+                     ['111', SP_i, '222', SP_w1,
+                      '333', SP_w1, '444', SP_w1, '555', SP_w1, '666']);
+      var result = printLine(source, 15);
+      expect(result, '111 222\n    333\n    444\n    555\n    666');
+    });
+
+    test('printLine - use weight - initializer - decl/rest too long', () {
+      var source = line(
+                     ['111', SP_i, '2222222222222', SP_w1,
+                      '333', SP_w1, '444', SP_w1, '555', SP_w1, '666']);
+      var result = printLine(source, 15);
+      expect(result, '111\n    2222222222222\n'
+          '        333\n        444\n        555\n        666');
+    });
+
     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);
       expect(isWhitespace('\t\t'), true);
       expect(isWhitespace('\n'), true);
@@ skipping 122 matching lines @@
           spacesPerIndent: spacesPerIndent,
           tabsForIndent: tabsForIndent
         )).source,
       equals(expected));
 
 expectStmtFormatsTo(src, expected, {transforms: true}) =>
     expect(formatStatement(src, options:
       new FormatterOptions(codeTransforms: transforms)), equals(expected));
 
 
-runTests(testFileName, expectClause(input, output)) {
-
+runTests(testFileName, expectClause(String input, String output)) {
   var testIndex = 1;
   var testFile = new File(join(TEST_DATA_DIR, testFileName));
   var lines = testFile.readAsLinesSync();
   for (var i = 1; i < lines.length; ++i) {
     var input = '', expectedOutput = '';
     while(!lines[i].startsWith('<<<')) {
       input += lines[i++] + '\n';
     }
     while(++i < lines.length && !lines[i].startsWith('>>>')) {
       expectedOutput += lines[i] + '\n';
     }
     test('test - (${testIndex++})', () {
       expectClause(input, expectedOutput);
     });
   }
 }