a few small refactorings to closure workarounds

tool/patch_sdk.dart

 #!/usr/bin/env dart
 // Copyright (c) 2015, 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.
 
 /// Command line tool to merge the SDK libraries and our patch files.
 /// This is currently designed as an offline tool, but we could automate it.
 library dev_compiler.tool.patch_sdk;
 
 import 'dart:io';
@@ skipping 170 matching lines @@
 
 /// Merge `@patch` declarations into `external` declarations.
 class PatchApplier extends GeneralizingAstVisitor {
   final StringEditBuffer edits;
   final PatchFinder patch;
 
   bool _isLibrary = true; // until proven otherwise.
 
   PatchApplier(this.edits, this.patch);
 
-  @override visitCompilationUnit(CompilationUnit node) {
+  @override
+  visitCompilationUnit(CompilationUnit node) {
     super.visitCompilationUnit(node);
     if (_isLibrary) _mergeUnpatched(node);
   }
 
   void _merge(AstNode node, int pos) {
     var code = patch.contents.substring(node.offset, node.end);
     edits.insert(pos, '\n' + code);
   }
 
   /// Merges directives and declarations that are not `@patch` into the library.
@@ skipping 15 matching lines @@
       _merge(d, partPos);
     }
 
     // Merge declarations from the patch
     int declPos = edits.original.length;
     for (var d in patch.mergeDeclarations) {
       _merge(d, declPos);
     }
   }
 
-  @override visitPartOfDirective(PartOfDirective node) {
+  @override
+  visitPartOfDirective(PartOfDirective node) {
     _isLibrary = false;
   }
 
-  @override visitFunctionDeclaration(FunctionDeclaration node) {
+  @override
+  visitFunctionDeclaration(FunctionDeclaration node) {
     _maybePatch(node);
   }
 
   /// Merge patches and extensions into the class
-  @override visitClassDeclaration(ClassDeclaration node) {
+  @override
+  visitClassDeclaration(ClassDeclaration node) {
     node.members.forEach(_maybePatch);
 
     var mergeMembers = patch.mergeMembers[_qualifiedName(node)];
     if (mergeMembers == null) return;
 
     // Merge members from the patch
     var pos = node.members.last.end;
     for (var member in mergeMembers) {
       var code = patch.contents.substring(member.offset, member.end);
       edits.insert(pos, '\n\n  ' + code);
@@ skipping 31 matching lines @@
   final Map patches = <String, Declaration>{};
   final Map mergeMembers = <String, List<ClassMember>>{};
   final List mergeDeclarations = <CompilationUnitMember>[];
 
   PatchFinder.parseAndVisit(String contents)
       : contents = contents,
         unit = parseCompilationUnit(contents) {
     visitCompilationUnit(unit);
   }
 
-  @override visitCompilationUnitMember(CompilationUnitMember node) {
+  @override
+  visitCompilationUnitMember(CompilationUnitMember node) {
     mergeDeclarations.add(node);
   }
 
-  @override visitClassDeclaration(ClassDeclaration node) {
+  @override
+  visitClassDeclaration(ClassDeclaration node) {
     if (_isPatch(node)) {
       var members = <ClassMember>[];
       for (var member in node.members) {
         if (_isPatch(member)) {
           patches[_qualifiedName(member)] = member;
         } else {
           members.add(member);
         }
       }
       if (members.isNotEmpty) {
         mergeMembers[_qualifiedName(node)] = members;
       }
     } else {
       mergeDeclarations.add(node);
     }
   }
 
-  @override visitFunctionDeclaration(FunctionDeclaration node) {
+  @override
+  visitFunctionDeclaration(FunctionDeclaration node) {
     if (_isPatch(node)) {
       patches[_qualifiedName(node)] = node;
     } else {
       mergeDeclarations.add(node);
     }
   }
 
-  @override visitFunctionBody(node) {} // skip method bodies
+  @override
+  visitFunctionBody(node) {} // skip method bodies
 }
 
 String _qualifiedName(Declaration node) {
   var parent = node.parent;
   var className = '';
   if (parent is ClassDeclaration) {
     className = parent.name.name + '.';
   }
   var name = (node as dynamic).name;
   return className + (name != null ? name.name : '');
@@ skipping 95 matching lines @@
     if (diff != 0) return diff;
     return end - other.end;
   }
 }
 
 List<SdkLibrary> _getSdkLibraries(String contents) {
   var libraryBuilder = new SdkLibrariesReader_LibraryBuilder(true);
   parseCompilationUnit(contents).accept(libraryBuilder);
   return libraryBuilder.librariesMap.sdkLibraries;
 }