Removed fixed dependencies

packages/dart_style/lib/src/dart_formatter.dart

 // Copyright (c) 2014, 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 dart_style.src.dart_formatter;
 
 import 'dart:math' as math;
 
 import 'package:analyzer/analyzer.dart';
+import 'package:analyzer/dart/ast/token.dart';
+import 'package:analyzer/src/dart/scanner/reader.dart';
+import 'package:analyzer/src/dart/scanner/scanner.dart';
 import 'package:analyzer/src/generated/parser.dart';
-import 'package:analyzer/src/generated/scanner.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/string_source.dart';
 
 import 'error_listener.dart';
 import 'formatter_exception.dart';
 import 'source_code.dart';
 import 'source_visitor.dart';
 
 /// Dart source code formatter.
 class DartFormatter {
@@ skipping 21 matching lines @@
   DartFormatter({this.lineEnding, int pageWidth, this.indent: 0})
       : this.pageWidth = (pageWidth == null) ? 80 : pageWidth;
 
   /// Formats the given [source] string containing an entire Dart compilation
   /// unit.
   ///
   /// If [uri] is given, it is a [String] or [Uri] used to identify the file
   /// being formatted in error messages.
   String format(String source, {uri}) {
     if (uri == null) {
-      uri = "<unknown>";
+      // Do nothing.
     } else if (uri is Uri) {
       uri = uri.toString();
     } else if (uri is String) {
       // Do nothing.
     } else {
       throw new ArgumentError("uri must be `null`, a Uri, or a String.");
     }
 
     return formatSource(
             new SourceCode(source, uri: uri, isCompilationUnit: true))
@@ skipping 29 matching lines @@
         lineEnding = "\r\n";
       } else {
         lineEnding = "\n";
       }
     }
 
     errorListener.throwIfErrors();
 
     // Parse it.
     var parser = new Parser(stringSource, errorListener);
+    parser.parseGenericMethods = true;
 
-    var node;
+    AstNode node;
     if (source.isCompilationUnit) {
       node = parser.parseCompilationUnit(startToken);
     } else {
       node = parser.parseStatement(startToken);
 
       // Make sure we consumed all of the source.
       var token = node.endToken.next;
       if (token.type != TokenType.EOF) {
         var error = new AnalysisError(
             stringSource,
             token.offset,
             math.max(token.length, 1),
             ParserErrorCode.UNEXPECTED_TOKEN,
             [token.lexeme]);
 
         throw new FormatterException([error]);
       }
     }
 
     errorListener.throwIfErrors();
 
     // Format it.
     var visitor = new SourceVisitor(this, lineInfo, source);
     return visitor.run(node);
   }
 }