Formatter space/tab width configuration fixes (dartbug.com/16969).

pkg/analyzer/lib/src/services/writer.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 source_writer;
 
 
 
 class Line {
 
@@ skipping 17 matching lines @@
   void addSpaces(int n, {breakWeight: DEFAULT_SPACE_WEIGHT}) {
     tokens.add(new SpaceToken(n, breakWeight: breakWeight));
   }
 
   void addToken(LineToken token) {
     tokens.add(token);
   }
 
   bool isEmpty() => tokens.isEmpty;
 
-  bool isWhitespace() => tokens.every((tok) => tok is SpaceToken);
+  bool isWhitespace() => tokens.every(
+      (tok) => tok is SpaceToken || tok is TabToken);
 
   void indent(int n) {
     tokens.insert(0,
         useTabs ? new TabToken(n) : new SpaceToken(n * spacesPerIndent));
   }
 
   String toString() => printer.printLine(this);
 
 }
 
@@ skipping 242 matching lines @@
 }
 
 
 class SourceWriter {
 
   final StringBuffer buffer = new StringBuffer();
   Line currentLine;
 
   final String lineSeparator;
   int indentCount = 0;
+  final int spacesPerIndent;
+  final bool useTabs;
 
   LinePrinter linePrinter;
   LineToken _lastToken;
 
   SourceWriter({this.indentCount: 0, this.lineSeparator: NEW_LINE,
-      bool useTabs: false, int spacesPerIndent: 2, int maxLineLength: 80}) {
+      this.useTabs: false, this.spacesPerIndent: 2, int maxLineLength: 80}) {
     if (maxLineLength > 0) {
       linePrinter = new SimpleLineBreaker(maxLineLength, (n) =>
           getIndentString(n, useTabs: useTabs, spacesPerIndent: spacesPerIndent));
     } else {
       linePrinter = new SimpleLinePrinter();
     }
     currentLine = newLine();
   }
 
   LineToken get lastToken => _lastToken;
@@ skipping 44 matching lines @@
   }
 
   void unindent() {
     --indentCount;
     // Rather than fiddle with deletions/insertions just start fresh
     if (currentLine.isWhitespace()) {
       currentLine = newLine();
     }
   }
 
-  Line newLine() => new Line(indentLevel: indentCount, printer: linePrinter);
+  Line newLine() => new Line(indentLevel: indentCount, useTabs: useTabs,
+      spacesPerIndent: spacesPerIndent, printer: linePrinter);
 
   String toString() {
     var source = new StringBuffer(buffer.toString());
     if (!currentLine.isWhitespace()) {
       source.write(currentLine);
     }
     return source.toString();
   }
 
 }
@@ skipping 46 matching lines @@
 
 String getTabs(int n) => n < TABS.length ? TABS[n] : repeat('\t', n);
 
 String repeat(String ch, int times) {
   var sb = new StringBuffer();
   for (var i = 0; i < times; ++i) {
     sb.write(ch);
   }
   return sb.toString();
 }