formatted
diff --git a/lib/assets.dart b/lib/assets.dart
index f34d090..0974ea2 100644
--- a/lib/assets.dart
+++ b/lib/assets.dart
@@ -27,8 +27,9 @@
 /// package, or when [errorsOnAbsolute] is true and the url seems to be
 /// absolute.
 // TODO(sigmund): delete once this is part of barback (dartbug.com/12610)
-AssetId uriToAssetId(AssetId source, String url, TransformLogger logger,
-    SourceSpan span, {bool errorOnAbsolute: true}) {
+AssetId uriToAssetId(
+    AssetId source, String url, TransformLogger logger, SourceSpan span,
+    {bool errorOnAbsolute: true}) {
   if (url == null || url == '') return null;
   var uri = Uri.parse(url);
   var urlBuilder = path.url;
@@ -36,8 +37,8 @@
     if (source.extension == '.dart' && uri.scheme == 'package') {
       var index = uri.path.indexOf('/');
       if (index != -1) {
-        return new AssetId(uri.path.substring(0, index),
-            'lib${uri.path.substring(index)}');
+        return new AssetId(
+            uri.path.substring(0, index), 'lib${uri.path.substring(index)}');
       }
     }
 
@@ -48,11 +49,11 @@
     return null;
   }
 
-  var targetPath = urlBuilder.normalize(
-      urlBuilder.join(urlBuilder.dirname(source.path), url));
+  var targetPath = urlBuilder
+      .normalize(urlBuilder.join(urlBuilder.dirname(source.path), url));
   var segments = urlBuilder.split(targetPath);
   var sourceSegments = urlBuilder.split(source.path);
-  assert (sourceSegments.length > 0);
+  assert(sourceSegments.length > 0);
   var topFolder = sourceSegments[0];
   var entryFolder = topFolder != 'lib' && topFolder != 'asset';
 
@@ -85,8 +86,8 @@
       fixedSegments.addAll(sourceSegments.map((_) => '..'));
       fixedSegments.addAll(segments.sublist(index));
       var fixedUrl = urlBuilder.joinAll(fixedSegments);
-      var msg = INVALID_URL_TO_OTHER_PACKAGE.create(
-          {'url': url, 'prefix': prefix, 'fixedUrl': fixedUrl});
+      var msg = INVALID_URL_TO_OTHER_PACKAGE
+          .create({'url': url, 'prefix': prefix, 'fixedUrl': fixedUrl});
       logger.warning(logger is BuildLogger ? msg : msg.snippet, span: span);
       return null;
     }
@@ -96,8 +97,8 @@
   return new AssetId(source.package, targetPath);
 }
 
-AssetId _extractOtherPackageId(int index, List segments,
-    TransformLogger logger, SourceSpan span) {
+AssetId _extractOtherPackageId(
+    int index, List segments, TransformLogger logger, SourceSpan span) {
   if (index >= segments.length) return null;
   var prefix = segments[index];
   if (prefix != 'packages' && prefix != 'assets') return null;
diff --git a/lib/messages/build_logger.dart b/lib/messages/build_logger.dart
index 61d93cf..0e7ecf8 100644
--- a/lib/messages/build_logger.dart
+++ b/lib/messages/build_logger.dart
@@ -52,8 +52,8 @@
   /// If transform is a [Transform] then [primaryId] will default to the
   /// primaryInput.id, if it is an [AggregateTransform] then you must pass in
   /// a [primaryId] to be used, otherwise you will get a runtime error.
-  BuildLogger(transform, {this.convertErrorsToWarnings: false,
-      AssetId primaryId, this.detailsUri})
+  BuildLogger(transform,
+      {this.convertErrorsToWarnings: false, AssetId primaryId, this.detailsUri})
       : _transform = transform,
         _primaryId = primaryId != null ? primaryId : transform.primaryInput.id;
 
@@ -111,8 +111,7 @@
   // Each phase outputs a new log file with an incrementing # appended, this
   // figures out the next # to use.
   Future<AssetId> _getNextLogAssetId([int nextNumber = 1]) {
-    var nextAssetPath = _primaryId.addExtension(
-        '${LOG_EXTENSION}.$nextNumber');
+    var nextAssetPath = _primaryId.addExtension('${LOG_EXTENSION}.$nextNumber');
     return _transform.hasInput(nextAssetPath).then((exists) {
       if (!exists) return nextAssetPath;
       return _getNextLogAssetId(++nextNumber);
@@ -120,8 +119,9 @@
   }
 
   // Reads all log files for an Asset into [logs].
-  static Future _readLogFilesForAsset(AssetId id, Transform transform,
-      LogEntryTable entries, [nextNumber = 1]) {
+  static Future _readLogFilesForAsset(
+      AssetId id, Transform transform, LogEntryTable entries,
+      [nextNumber = 1]) {
     var nextAssetPath = id.addExtension('${LOG_EXTENSION}.$nextNumber');
     return transform.hasInput(nextAssetPath).then((exists) {
       if (!exists) return null;
diff --git a/lib/messages/messages.dart b/lib/messages/messages.dart
index b30c58e..56f3c0e 100644
--- a/lib/messages/messages.dart
+++ b/lib/messages/messages.dart
@@ -31,7 +31,7 @@
   /// Serialize this message. We use a string and not a map to encode ids so
   /// they can be used as keys in JSON maps.
   String toJson() => toString();
-  
+
   toString() => '${package}#$id';
 
   int compareTo(MessageId other) {
@@ -44,8 +44,8 @@
   factory MessageId.fromJson(data) {
     var index = data.lastIndexOf('#');
     if (index == -1) throw 'Invalid message id: $data';
-    return new MessageId(data.substring(0, index),
-        int.parse(data.substring(index + 1)));
+    return new MessageId(
+        data.substring(0, index), int.parse(data.substring(index + 1)));
   }
 
   operator ==(MessageId other) => package == other.package && id == other.id;
@@ -70,8 +70,8 @@
   String toString() => 'id: $id, snippet: $snippet';
 
   /// Creates a new [Message] from an encoded value produced via [toJson].
-  factory Message.fromJson(data) => new Message(
-      new MessageId.fromJson(data['id']), data['snippet']);
+  factory Message.fromJson(data) =>
+      new Message(new MessageId.fromJson(data['id']), data['snippet']);
 }
 
 /// Template for a message. Templates can include placeholders to indicate
@@ -164,10 +164,7 @@
 
   /// Serializes this log entry to JSON.
   Map toJson() {
-    var data = {
-        'level': level,
-        'message': message.toJson(),
-    };
+    var data = {'level': level, 'message': message.toJson(),};
     if (span != null) {
       data['span'] = {
         'start': {
@@ -201,13 +198,12 @@
     var res = new LogEntryTable();
     for (String key in json.keys) {
       var id = new MessageId.fromJson(key);
-      res.entries[id] = json[key]
-          .map((v) => new BuildLogEntry.fromJson(v)).toList();
+      res.entries[id] =
+          json[key].map((v) => new BuildLogEntry.fromJson(v)).toList();
     }
     return res;
   }
 
-
   /// Serializes this entire table as JSON.
   Map toJson() {
     var res = {};
diff --git a/lib/src/dart_sdk.dart b/lib/src/dart_sdk.dart
index 8665749..454ff83 100644
--- a/lib/src/dart_sdk.dart
+++ b/lib/src/dart_sdk.dart
@@ -13,7 +13,6 @@
 import 'package:analyzer/src/generated/source.dart';
 import 'package:cli_util/cli_util.dart' as cli_util;
 
-
 /// Attempts to provide the current Dart SDK directory.
 ///
 /// This will return null if the SDK cannot be found
@@ -44,11 +43,10 @@
 /// with URIs.
 class DartUriResolverProxy implements DartUriResolver {
   final DartUriResolver _proxy;
-  DartUriResolverProxy(DartSdk sdk) :
-      _proxy = new DartUriResolver(sdk);
+  DartUriResolverProxy(DartSdk sdk) : _proxy = new DartUriResolver(sdk);
 
   Source resolveAbsolute(Uri uri) =>
-    DartSourceProxy.wrap(_proxy.resolveAbsolute(uri), uri);
+      DartSourceProxy.wrap(_proxy.resolveAbsolute(uri), uri);
 
   DartSdk get dartSdk => _proxy.dartSdk;
 
@@ -98,7 +96,7 @@
   bool exists() => _proxy.exists();
 
   bool operator ==(Object other) =>
-    (other is DartSourceProxy && _proxy == other._proxy);
+      (other is DartSourceProxy && _proxy == other._proxy);
 
   int get hashCode => _proxy.hashCode;
 
@@ -117,7 +115,6 @@
   bool get isInSystemLibrary => _proxy.isInSystemLibrary;
 }
 
-
 /// Dart SDK which contains a mock implementation of the SDK libraries. May be
 /// used to speed up resultion when most of the core libraries is not needed.
 class MockDartSdk implements DartSdk {
@@ -157,8 +154,8 @@
     var src = _sources[uri];
     if (src == null) {
       if (reportMissing) print('warning: missing mock for $uri.');
-      _sources[uri] = src =
-          new _MockSdkSource(uri, 'library dart.${uri.path};');
+      _sources[uri] =
+          src = new _MockSdkSource(uri, 'library dart.${uri.path};');
     }
     return src;
   }
diff --git a/lib/src/entry_point.dart b/lib/src/entry_point.dart
index ed9eb28..21f7acf 100644
--- a/lib/src/entry_point.dart
+++ b/lib/src/entry_point.dart
@@ -15,8 +15,12 @@
 bool isPossibleDartEntryId(AssetId id) {
   if (id.extension != '.dart') return false;
 
-  return ['benchmark', 'example', 'test', 'web']
-      .any((dir) => id.path.startsWith("$dir/"));
+  return [
+    'benchmark',
+    'example',
+    'test',
+    'web'
+  ].any((dir) => id.path.startsWith("$dir/"));
 }
 
 /// Checks to see if the provided Asset is possibly a Dart entry point.
@@ -39,10 +43,10 @@
 bool _couldBeEntrypoint(CompilationUnit compilationUnit) {
   // Allow two or fewer arguments so that entrypoints intended for use with
   // [spawnUri] get counted.
-  var hasMain = compilationUnit.declarations.any((node) =>
-      node is FunctionDeclaration &&
-      node.name.name == "main" &&
-      node.functionExpression.parameters.parameters.length <= 2);
+  var hasMain = compilationUnit.declarations.any(
+      (node) => node is FunctionDeclaration &&
+          node.name.name == "main" &&
+          node.functionExpression.parameters.parameters.length <= 2);
 
   if (hasMain) return true;
 
@@ -50,6 +54,6 @@
   // in there.
   // We avoid loading those since this can be run from isPrimaryAsset calls
   // where we do not have access to other sources.
-  return compilationUnit.directives.any((node) =>
-      node is ExportDirective || node is PartDirective);
+  return compilationUnit.directives
+      .any((node) => node is ExportDirective || node is PartDirective);
 }
diff --git a/lib/src/messages.dart b/lib/src/messages.dart
index a1a8e58..0de6214 100644
--- a/lib/src/messages.dart
+++ b/lib/src/messages.dart
@@ -9,9 +9,7 @@
 
 const NO_ABSOLUTE_PATHS = const MessageTemplate(
     const MessageId('code_transformers', 1),
-    'absolute paths not allowed: "%-url-%"',
-    'Absolute paths not allowed',
-    '''
+    'absolute paths not allowed: "%-url-%"', 'Absolute paths not allowed', '''
 The transformers processing your code were trying to resolve a URL and identify
 a file that they correspond to. Currently only relative paths can be resolved.
 ''');
@@ -21,9 +19,7 @@
     'Invalid URL to reach to another package: %-url-%. Path '
     'reaching to other packages must first reach up all the '
     'way to the %-prefix-% directory. For example, try changing the URL '
-    'to: %-fixedUrl-%',
-    'Invalid URL to reach another package',
-    '''
+    'to: %-fixedUrl-%', 'Invalid URL to reach another package', '''
 To reach an asset that belongs to another package, use `package:` URLs in
 Dart code, but in any other language (like HTML or CSS) use relative URLs that
 first go all the way to the `packages/` directory.
@@ -38,8 +34,7 @@
     const MessageId('code_transformers', 3),
     'incomplete %-prefix-%/ path. It should have at least 3 '
     'segments %-prefix-%/name/path_from_name\'s_%-folder-%_dir',
-    'Incomplete URL to asset in another package',
-    '''
+    'Incomplete URL to asset in another package', '''
 URLs that refer to assets in other packages need to explicitly mention the
 `packages/` directory. In the future this requirement might be removed, but for
 now you must use a canonical URL form for it.
diff --git a/lib/src/remove_sourcemap_comment.dart b/lib/src/remove_sourcemap_comment.dart
index 1032ed5..70f4b9c 100644
--- a/lib/src/remove_sourcemap_comment.dart
+++ b/lib/src/remove_sourcemap_comment.dart
@@ -21,8 +21,8 @@
     var id = transform.primaryInput.id;
     return transform.readInputAsString(id).then((file) {
       if (file.contains(_SOURCE_MAP_COMMENT)) {
-        transform.addOutput(new Asset.fromString(
-            id, file.replaceAll(_SOURCE_MAP_COMMENT, '')));
+        transform.addOutput(
+            new Asset.fromString(id, file.replaceAll(_SOURCE_MAP_COMMENT, '')));
       }
     });
   }
diff --git a/lib/src/resolver.dart b/lib/src/resolver.dart
index 2d5eda9..7d5c8d0 100644
--- a/lib/src/resolver.dart
+++ b/lib/src/resolver.dart
@@ -13,7 +13,6 @@
 import 'package:source_maps/refactor.dart';
 import 'package:source_span/source_span.dart';
 
-
 /// Class for working with a barback based resolved AST.
 abstract class Resolver {
   /// Update the status of all the sources referenced by the entry points and
diff --git a/lib/src/resolver_impl.dart b/lib/src/resolver_impl.dart
index 1d25705..1204012 100644
--- a/lib/src/resolver_impl.dart
+++ b/lib/src/resolver_impl.dart
@@ -7,8 +7,8 @@
 import 'dart:async';
 import 'package:analyzer/analyzer.dart' show parseDirectives;
 import 'package:analyzer/src/generated/ast.dart' hide ConstantEvaluator;
-import 'package:analyzer/src/generated/constant.dart' show ConstantEvaluator,
-       EvaluationResult;
+import 'package:analyzer/src/generated/constant.dart'
+    show ConstantEvaluator, EvaluationResult;
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/sdk.dart' show DartSdk;
@@ -31,8 +31,8 @@
 /// with the resolved AST.
 class ResolverImpl implements Resolver {
   /// Cache of all asset sources currently referenced.
-  final Map<AssetId, _AssetBasedSource> sources =
-      <AssetId, _AssetBasedSource>{};
+  final Map<AssetId, _AssetBasedSource> sources = <AssetId, _AssetBasedSource>{
+  };
 
   final InternalAnalysisContext _context =
       AnalysisEngine.instance.createAnalysisContext();
@@ -62,8 +62,8 @@
     }
     _context.analysisOptions = options;
     sdk.context.analysisOptions = options;
-    _context.sourceFactory = new SourceFactory([dartUriResolver,
-        new _AssetUriResolver(this)]);
+    _context.sourceFactory =
+        new SourceFactory([dartUriResolver, new _AssetUriResolver(this)]);
   }
 
   LibraryElement getLibrary(AssetId assetId) {
@@ -78,7 +78,7 @@
     var future = _lastPhaseComplete.whenComplete(() {
       _currentPhaseComplete = phaseComplete;
       return _performResolve(transform,
-        entryPoints == null ? [transform.primaryInput.id] : entryPoints);
+          entryPoints == null ? [transform.primaryInput.id] : entryPoints);
     }).then((_) => this);
     // Advance the lastPhaseComplete to be done when this phase is all done.
     _lastPhaseComplete = phaseComplete.future;
@@ -121,13 +121,13 @@
         }
         source.updateDependencies(contents);
         toUpdate.add(new _PendingUpdate(source, contents));
-        source.dependentAssets.where((id) => !visited.contains(id))
+        source.dependentAssets
+            .where((id) => !visited.contains(id))
             .forEach(processAsset);
       }, onError: (e) {
         var source = sources[assetId];
         if (source != null && source.exists()) {
-          _context.applyChanges(
-              new ChangeSet()..removedSource(source));
+          _context.applyChanges(new ChangeSet()..removedSource(source));
           sources[assetId].updateContents(null);
         }
       }));
@@ -139,9 +139,8 @@
     return visiting.future.then((_) {
       var changeSet = new ChangeSet();
       toUpdate.forEach((pending) => pending.apply(changeSet));
-      var unreachableAssets = sources.keys.toSet()
-          .difference(visited)
-          .map((id) => sources[id]);
+      var unreachableAssets =
+          sources.keys.toSet().difference(visited).map((id) => sources[id]);
       for (var unreachable in unreachableAssets) {
         changeSet.removedSource(unreachable);
         unreachable.updateContents(null);
@@ -187,8 +186,8 @@
     var dotIndex = typeName.lastIndexOf('.');
     var libraryName = dotIndex == -1 ? '' : typeName.substring(0, dotIndex);
 
-    var className = dotIndex == -1 ?
-        typeName : typeName.substring(dotIndex + 1);
+    var className =
+        dotIndex == -1 ? typeName : typeName.substring(dotIndex + 1);
 
     for (var lib in libraries.where((l) => l.name == libraryName)) {
       var type = lib.getType(className);
@@ -201,28 +200,27 @@
     var dotIndex = variableName.lastIndexOf('.');
     var libraryName = dotIndex == -1 ? '' : variableName.substring(0, dotIndex);
 
-    var name = dotIndex == -1 ?
-        variableName : variableName.substring(dotIndex + 1);
+    var name =
+        dotIndex == -1 ? variableName : variableName.substring(dotIndex + 1);
 
-    return libraries.where((lib) => lib.name == libraryName)
+    return libraries
+        .where((lib) => lib.name == libraryName)
         .expand((lib) => lib.units)
         .expand((unit) => unit.topLevelVariables)
-        .firstWhere((variable) => variable.name == name,
-            orElse: () => null);
+        .firstWhere((variable) => variable.name == name, orElse: () => null);
   }
 
   Element getLibraryFunction(String fnName) {
     var dotIndex = fnName.lastIndexOf('.');
     var libraryName = dotIndex == -1 ? '' : fnName.substring(0, dotIndex);
 
-    var name = dotIndex == -1 ?
-        fnName : fnName.substring(dotIndex + 1);
+    var name = dotIndex == -1 ? fnName : fnName.substring(dotIndex + 1);
 
-    return libraries.where((lib) => lib.name == libraryName)
+    return libraries
+        .where((lib) => lib.name == libraryName)
         .expand((lib) => lib.units)
         .expand((unit) => unit.functions)
-        .firstWhere((fn) => fn.name == name,
-            orElse: () => null);
+        .firstWhere((fn) => fn.name == name, orElse: () => null);
   }
 
   EvaluationResult evaluateConstant(
@@ -234,7 +232,6 @@
   Uri getImportUri(LibraryElement lib, {AssetId from}) =>
       _getSourceUri(lib, from: from);
 
-
   /// Similar to getImportUri but will get the part URI for parts rather than
   /// the library URI.
   Uri _getSourceUri(Element element, {AssetId from}) {
@@ -315,11 +312,13 @@
     if (contents == _contents) return;
     var unit = parseDirectives(contents, suppressErrors: true);
     _dependentAssets = unit.directives
-        .where((d) => (d is ImportDirective || d is PartDirective ||
+        .where((d) => (d is ImportDirective ||
+            d is PartDirective ||
             d is ExportDirective))
-        .map((d) => _resolve(assetId, d.uri.stringValue, _logger,
-              _getSpan(d, contents)))
-        .where((id) => id != null).toSet();
+        .map((d) => _resolve(
+            assetId, d.uri.stringValue, _logger, _getSpan(d, contents)))
+        .where((id) => id != null)
+        .toSet();
   }
 
   /// Update the contents of this file with [contents].
@@ -468,15 +467,16 @@
 }
 
 /// Get an asset ID for a URL relative to another source asset.
-AssetId _resolve(AssetId source, String url, TransformLogger logger,
-    SourceSpan span) {
+AssetId _resolve(
+    AssetId source, String url, TransformLogger logger, SourceSpan span) {
   if (url == null || url == '') return null;
   var uri = Uri.parse(url);
 
   // Workaround for dartbug.com/17156- pub transforms package: imports from
   // files of the transformers package to have absolute /packages/ URIs.
-  if (uri.scheme == '' && path.isAbsolute(url)
-      && uri.pathSegments[0] == 'packages') {
+  if (uri.scheme == '' &&
+      path.isAbsolute(url) &&
+      uri.pathSegments[0] == 'packages') {
     uri = Uri.parse('package:${uri.pathSegments.skip(1).join(path.separator)}');
   }
 
@@ -492,7 +492,6 @@
   return uriToAssetId(source, url, logger, span);
 }
 
-
 /// A completer that waits until all added [Future]s complete.
 // TODO(blois): Copied from quiver. Remove from here when it gets
 // added to dart:core. (See #6626.)
diff --git a/lib/src/resolvers.dart b/lib/src/resolvers.dart
index 1ef98dc..fa2f953 100644
--- a/lib/src/resolvers.dart
+++ b/lib/src/resolvers.dart
@@ -53,8 +53,8 @@
   /// resolver.
   Future<Resolver> get(Transform transform, [List<AssetId> entryPoints]) {
     var id = transform.primaryInput.id;
-    var resolver = _resolvers.putIfAbsent(id,
-        () => new ResolverImpl(dartSdk, dartUriResolver, options: options));
+    var resolver = _resolvers.putIfAbsent(
+        id, () => new ResolverImpl(dartSdk, dartUriResolver, options: options));
     return resolver.resolve(transform, entryPoints);
   }
 }
@@ -84,7 +84,6 @@
   /// [isPossibleDartEntry]).
   Future<bool> shouldApplyResolver(Asset asset) => isPossibleDartEntry(asset);
 
-
   /// This provides a default implementation of `Transformer.apply` that will
   /// get and release resolvers automatically. Internally this:
   ///   * Gets a resolver associated with the transform primary input.
@@ -96,9 +95,8 @@
   /// to run the resolver on.
   Future apply(Transform transform) =>
       shouldApplyResolver(transform.primaryInput).then((result) {
-        if (result) return applyToEntryPoints(transform);
-      });
-
+    if (result) return applyToEntryPoints(transform);
+  });
 
   /// Helper function to make it easy to write an `Transformer.apply` method
   /// that automatically gets and releases the resolver. This is typically used
@@ -110,10 +108,10 @@
   ///    }
   Future applyToEntryPoints(Transform transform, [List<AssetId> entryPoints]) {
     return resolvers.get(transform, entryPoints).then((resolver) {
-      return new Future(() => applyResolver(transform, resolver))
-        .whenComplete(() {
-          resolver.release();
-        });
+      return new Future(() => applyResolver(transform, resolver)).whenComplete(
+          () {
+        resolver.release();
+      });
     });
   }
 
diff --git a/lib/src/test_harness.dart b/lib/src/test_harness.dart
index a25cf52..817fbb3 100644
--- a/lib/src/test_harness.dart
+++ b/lib/src/test_harness.dart
@@ -70,8 +70,9 @@
 
       var msg = '${entry.level.name.toLowerCase()}: ${entry.message}';
       var span = entry.span;
-      var spanInfo = span == null ? '' :
-          ' (${span.sourceUrl} ${span.start.line} ${span.start.column})';
+      var spanInfo = span == null
+          ? ''
+          : ' (${span.sourceUrl} ${span.start.line} ${span.start.column})';
       expect(messagesSeen, lessThan(messages.length),
           reason: 'more messages than expected.\nMessage seen: $msg$spanInfo');
       expect('$msg$spanInfo', messages[messagesSeen++]);
@@ -91,8 +92,9 @@
     barback.updateSources(paths.map(idFromString));
   }
 
-  Future<String> operator [](String assetString){
-    return barback.getAssetById(idFromString(assetString))
+  Future<String> operator [](String assetString) {
+    return barback
+        .getAssetById(idFromString(assetString))
         .then((asset) => asset.readAsString());
   }
 
@@ -104,8 +106,6 @@
     });
   }
 
-
-
   Future checkAll(Map<String, String> files) {
     return barback.results.first.then((_) {
       if (files == null) return null;
@@ -117,8 +117,8 @@
     }).then((_) {
       // We only check messages when an expectation is provided.
       if (messages == null) return;
-      expect(messagesSeen, messages.length,
-          reason: 'less messages than expected');
+      expect(
+          messagesSeen, messages.length, reason: 'less messages than expected');
     });
   }
 }
@@ -146,10 +146,8 @@
       stripTrailingWhitespace: true,
       stripNewlines: true);
 
-  const StringFormatter({
-      this.stripLeadingWhitespace: false,
-      this.stripTrailingWhitespace: false,
-      this.stripNewlines: false});
+  const StringFormatter({this.stripLeadingWhitespace: false,
+      this.stripTrailingWhitespace: false, this.stripNewlines: false});
 
   String formatString(String str) {
     if (stripLeadingWhitespace) str = _removeLeadingWhitespace(str);
@@ -159,12 +157,10 @@
   }
 }
 
-String _removeTrailingWhitespace(String str) =>
-    str.splitMapJoin('\n',
-        onNonMatch: (s) => s.replaceAll(new RegExp(r'\s+$'), ''));
+String _removeTrailingWhitespace(String str) => str.splitMapJoin('\n',
+    onNonMatch: (s) => s.replaceAll(new RegExp(r'\s+$'), ''));
 
-String _removeLeadingWhitespace(String str) =>
-    str.splitMapJoin('\n',
-        onNonMatch: (s) => s.replaceAll(new RegExp(r'^\s+'), ''));
+String _removeLeadingWhitespace(String str) => str.splitMapJoin('\n',
+    onNonMatch: (s) => s.replaceAll(new RegExp(r'^\s+'), ''));
 
 String _removeNewlines(String str) => str.replaceAll('\n', '');
diff --git a/lib/tests.dart b/lib/tests.dart
index a394613..9cb0a40 100644
--- a/lib/tests.dart
+++ b/lib/tests.dart
@@ -22,10 +22,12 @@
 testPhases(String testName, List<List<Transformer>> phases,
     Map<String, String> inputs, Map<String, String> results,
     [List<String> messages,
-     StringFormatter formatter = StringFormatter.noTrailingWhitespace]) {
-  test(testName,
-    () => applyTransformers(phases, inputs: inputs, results: results,
-        messages: messages, formatter: formatter));
+    StringFormatter formatter = StringFormatter.noTrailingWhitespace]) {
+  test(testName, () => applyTransformers(phases,
+      inputs: inputs,
+      results: results,
+      messages: messages,
+      formatter: formatter));
 }
 
 /// Updates the provided transformers with [inputs] as asset inputs then
@@ -37,13 +39,11 @@
 /// If [messages] is non-null then this will validate that only the specified
 /// messages were generated, ignoring info messages.
 Future applyTransformers(List<List<Transformer>> phases,
-    {Map<String, String> inputs: const {},
-    Map<String, String> results: const {},
-    List<String> messages: const [],
+    {Map<String, String> inputs: const {}, Map<String, String> results: const {
+}, List<String> messages: const [],
     StringFormatter formatter: StringFormatter.noTrailingWhitespace}) {
-
-  var helper = new TestHelper(
-      phases, inputs, messages, formatter: formatter)..run();
+  var helper = new TestHelper(phases, inputs, messages, formatter: formatter)
+    ..run();
   return helper.checkAll(results).then((_) => helper.tearDown());
 }
 
diff --git a/test/assets_test.dart b/test/assets_test.dart
index d069d2a..8941e22 100644
--- a/test/assets_test.dart
+++ b/test/assets_test.dart
@@ -15,25 +15,19 @@
 main() {
   useCompactVMConfiguration();
 
-
-  void testAssetUri(String name,
-      {AssetId source, String uri, AssetId result, String message,
-      bool errorOnAbsolute: true}) {
+  void testAssetUri(String name, {AssetId source, String uri, AssetId result,
+      String message, bool errorOnAbsolute: true}) {
     test(name, () {
       var transformer = new Validator((transform) {
-      var assetId = uriToAssetId(source, uri, transform.logger, null,
-          errorOnAbsolute: errorOnAbsolute);
+        var assetId = uriToAssetId(source, uri, transform.logger, null,
+            errorOnAbsolute: errorOnAbsolute);
         expect(assetId, result);
       });
       var messages = [];
       if (message != null) messages.add(message);
 
-      return applyTransformers(
-            [[transformer]],
-            inputs: {
-              source.toString(): ''
-            },
-            messages: messages);
+      return applyTransformers([[transformer]],
+          inputs: {source.toString(): ''}, messages: messages);
     });
   }
 
@@ -67,9 +61,9 @@
         source: new AssetId('a', 'lib/index.html'),
         uri: 'packages/foo/bar',
         message: 'warning: Invalid URL to reach to another package: '
-            'packages/foo/bar. Path reaching to other packages must first '
-            'reach up all the way to the packages directory. For example, try '
-            'changing the URL to: ../../packages/foo/bar');
+        'packages/foo/bar. Path reaching to other packages must first '
+        'reach up all the way to the packages directory. For example, try '
+        'changing the URL to: ../../packages/foo/bar');
 
     testAssetUri('allows relative packages from non-dart lib files',
         source: new AssetId('a', 'lib/index.html'),
@@ -84,8 +78,7 @@
     testAssetUri('does not allow absolute /packages by default',
         source: new AssetId('a', 'lib/index.html'),
         uri: '/packages/foo/bar.dart',
-        message:
-            'warning: absolute paths not allowed: "/packages/foo/bar.dart"');
+        message: 'warning: absolute paths not allowed: "/packages/foo/bar.dart"');
 
     testAssetUri('can suppress error on absolute /packages ',
         source: new AssetId('a', 'lib/index.html'),
diff --git a/test/entry_point_test.dart b/test/entry_point_test.dart
index 20b354a..99c4369 100644
--- a/test/entry_point_test.dart
+++ b/test/entry_point_test.dart
@@ -21,74 +21,49 @@
         expect(value, expectation);
       });
     });
-    return applyTransformers(
-          [[transformer]],
-          inputs: inputs);
+    return applyTransformers([[transformer]], inputs: inputs);
   }
 
   group('isPossibleDartEntry', () {
     test('should handle empty files', () {
       return checkDartEntry(
-          inputs: {
-            'a|web/main.dart': '',
-          },
-          expectation: false);
+          inputs: {'a|web/main.dart': '',}, expectation: false);
     });
 
     test('should detect main methods', () {
       return checkDartEntry(
-          inputs: {
-            'a|web/main.dart': 'main() {}',
-          },
-          expectation: true);
+          inputs: {'a|web/main.dart': 'main() {}',}, expectation: true);
     });
 
     test('should exclude dart mains in lib folder', () {
       return checkDartEntry(
-          inputs: {
-            'a|lib/main.dart': 'main() {}',
-          },
-          expectation: false);
+          inputs: {'a|lib/main.dart': 'main() {}',}, expectation: false);
     });
 
     test('should validate file extension', () {
       return checkDartEntry(
-          inputs: {
-            'a|web/main.not_dart': 'main() {}',
-          },
-          expectation: false);
+          inputs: {'a|web/main.not_dart': 'main() {}',}, expectation: false);
     });
 
     test('should count exports as main', () {
       return checkDartEntry(
-          inputs: {
-            'a|web/main.dart': 'export "foo.dart";',
-          },
+          inputs: {'a|web/main.dart': 'export "foo.dart";',},
           expectation: true);
     });
 
     test('should count parts as main', () {
       return checkDartEntry(
-          inputs: {
-            'a|web/main.dart': 'part "foo.dart";',
-          },
-          expectation: true);
+          inputs: {'a|web/main.dart': 'part "foo.dart";',}, expectation: true);
     });
 
     test('is tolerant of syntax errors with main', () {
       return checkDartEntry(
-          inputs: {
-            'a|web/main.dart': 'main() {} {',
-          },
-          expectation: true);
+          inputs: {'a|web/main.dart': 'main() {} {',}, expectation: true);
     });
 
     test('is tolerant of syntax errors without main', () {
       return checkDartEntry(
-          inputs: {
-            'a|web/main.dart': 'class Foo {',
-          },
-          expectation: false);
+          inputs: {'a|web/main.dart': 'class Foo {',}, expectation: false);
     });
   });
 }
diff --git a/test/messages_test.dart b/test/messages_test.dart
index b03ca1c..49142c6 100644
--- a/test/messages_test.dart
+++ b/test/messages_test.dart
@@ -14,35 +14,32 @@
   group('snippet', () {
     test('template with no-args works', () {
       expect(new MessageTemplate(_id('code_transformers', 1),
-            'this message has no args', '', '').snippet,
+              'this message has no args', '', '').snippet,
           'this message has no args');
     });
 
     test('template with args throws', () {
       expect(() => new MessageTemplate(_id('code_transformers', 1),
-            'this message has %-args-%', '', '')
-          .snippet,
-          throws);
+          'this message has %-args-%', '', '').snippet, throws);
     });
 
     test('can pass arguments to create snippet', () {
       expect(new MessageTemplate(_id('code_transformers', 1),
-            'a %-b-% c something %-name-% too', '', '')
-          .create({'b': "1", 'name': 'foo'}).snippet,
+                  'a %-b-% c something %-name-% too', '', '')
+              .create({'b': "1", 'name': 'foo'}).snippet,
           'a 1 c something foo too');
     });
   });
 
   test('equals', () {
-      expect(new MessageId('hi', 23) == new MessageId('hi', 23), isTrue);
-      expect(new MessageId('foo', 23) != new MessageId('bar', 23), isTrue);
-      expect(new MessageId('foo', 22) != new MessageId('foo', 23), isTrue);
+    expect(new MessageId('hi', 23) == new MessageId('hi', 23), isTrue);
+    expect(new MessageId('foo', 23) != new MessageId('bar', 23), isTrue);
+    expect(new MessageId('foo', 22) != new MessageId('foo', 23), isTrue);
   });
 
   for (var encode in [true, false]) {
-    var toJson = encode 
-        ? (o) => o.toJson()
-        : (o) => JSON.decode(JSON.encode(o));
+    var toJson =
+        encode ? (o) => o.toJson() : (o) => JSON.decode(JSON.encode(o));
     group('serialize/deserialize ${encode ? "and stringify": ""}', () {
       test('message id', () {
         _eq(msg) {
@@ -63,7 +60,8 @@
           expect(msg.snippet, parsed.snippet);
         }
         _eq(new Message(_id('hi', 33), 'snippet here'));
-        _eq(new MessageTemplate(_id('hi', 33), 'snippet', 'ignored', 'ignored'));
+        _eq(new MessageTemplate(
+            _id('hi', 33), 'snippet', 'ignored', 'ignored'));
       });
 
       test('log entry', () {
@@ -103,9 +101,7 @@
 }
 _id(s, i) => new MessageId(s, i);
 _entry(id, snippet, offset) => new BuildLogEntry(
-    new Message(_id('hi', id), snippet),
-    new SourceSpan(
-      new SourceLocation(offset, sourceUrl: 'a', line: 1, column: 3),
-      new SourceLocation(offset + 2, sourceUrl: 'a', line: 1, column: 5),
-      'hi'),
-    'Warning');
+    new Message(_id('hi', id), snippet), new SourceSpan(
+        new SourceLocation(offset, sourceUrl: 'a', line: 1, column: 3),
+        new SourceLocation(offset + 2, sourceUrl: 'a', line: 1, column: 5),
+        'hi'), 'Warning');
diff --git a/test/remove_sourcemap_comment_test.dart b/test/remove_sourcemap_comment_test.dart
index f4d2730..f4cdf33 100644
--- a/test/remove_sourcemap_comment_test.dart
+++ b/test/remove_sourcemap_comment_test.dart
@@ -9,18 +9,22 @@
 import 'package:code_transformers/tests.dart';
 import 'package:unittest/compact_vm_config.dart';
 
-final phases = [[new RemoveSourcemapComment.asPlugin(
-    new BarbackSettings({}, BarbackMode.RELEASE))]];
+final phases = [
+  [
+    new RemoveSourcemapComment.asPlugin(
+        new BarbackSettings({}, BarbackMode.RELEASE))
+  ]
+];
 
 void main() {
   useCompactVMConfiguration();
 
   testPhases('removes sourcemap comments', phases, {
-      'a|web/test.js': '''
+    'a|web/test.js': '''
           var i = 0;
           //# sourceMappingURL=*.map''',
   }, {
-      'a|web/test.js': '''
+    'a|web/test.js': '''
           var i = 0;''',
   });
 }
diff --git a/test/resolver_test.dart b/test/resolver_test.dart
index 5807fd7..13da652 100644
--- a/test/resolver_test.dart
+++ b/test/resolver_test.dart
@@ -30,329 +30,290 @@
 resolverTests(Resolvers resolvers) {
   var entryPoint = new AssetId('a', 'web/main.dart');
   Future validateResolver({Map<String, String> inputs, validator(Resolver),
-      List<String> messages: const[]}) {
+      List<String> messages: const []}) {
     return applyTransformers(
-          [[new TestTransformer(resolvers, entryPoint, validator)]],
-          inputs: inputs,
-          messages: messages);
+        [[new TestTransformer(resolvers, entryPoint, validator)]],
+        inputs: inputs, messages: messages);
   }
 
   group('Resolver', () {
-
     test('should handle initial files', () {
       return validateResolver(
-          inputs: {
-            'a|web/main.dart': ' main() {}',
-          },
-          validator: (resolver) {
-            var source = resolver.sources[entryPoint];
-            expect(source.modificationStamp, 1);
+          inputs: {'a|web/main.dart': ' main() {}',}, validator: (resolver) {
+        var source = resolver.sources[entryPoint];
+        expect(source.modificationStamp, 1);
 
-            var lib = resolver.getLibrary(entryPoint);
-            expect(lib, isNotNull);
-          });
+        var lib = resolver.getLibrary(entryPoint);
+        expect(lib, isNotNull);
+      });
     });
 
     test('should update when sources change', () {
-      return validateResolver(
-          inputs: {
-            'a|web/main.dart': ''' main() {
+      return validateResolver(inputs: {
+        'a|web/main.dart': ''' main() {
                 } ''',
-          },
-          validator: (resolver) {
-            var source = resolver.sources[entryPoint];
-            expect(source.modificationStamp, 2);
+      }, validator: (resolver) {
+        var source = resolver.sources[entryPoint];
+        expect(source.modificationStamp, 2);
 
-            var lib = resolver.getLibrary(entryPoint);
-            expect(lib, isNotNull);
-            expect(lib.entryPoint, isNotNull);
-          });
+        var lib = resolver.getLibrary(entryPoint);
+        expect(lib, isNotNull);
+        expect(lib.entryPoint, isNotNull);
+      });
     });
 
     test('should follow imports', () {
-      return validateResolver(
-          inputs: {
-            'a|web/main.dart': '''
+      return validateResolver(inputs: {
+        'a|web/main.dart': '''
               import 'a.dart';
 
               main() {
               } ''',
-            'a|web/a.dart': '''
+        'a|web/a.dart': '''
               library a;
               ''',
-          },
-          validator: (resolver) {
-            var lib = resolver.getLibrary(entryPoint);
-            expect(lib.importedLibraries.length, 2);
-            var libA = lib.importedLibraries.where((l) => l.name == 'a').single;
-            expect(libA.getType('Foo'), isNull);
-          });
+      }, validator: (resolver) {
+        var lib = resolver.getLibrary(entryPoint);
+        expect(lib.importedLibraries.length, 2);
+        var libA = lib.importedLibraries.where((l) => l.name == 'a').single;
+        expect(libA.getType('Foo'), isNull);
+      });
     });
 
     test('should update changed imports', () {
-      return validateResolver(
-          inputs: {
-            'a|web/main.dart': '''
+      return validateResolver(inputs: {
+        'a|web/main.dart': '''
               import 'a.dart';
 
               main() {
               } ''',
-            'a|web/a.dart': '''
+        'a|web/a.dart': '''
               library a;
               class Foo {}
               ''',
-          },
-          validator: (resolver) {
-            var lib = resolver.getLibrary(entryPoint);
-            expect(lib.importedLibraries.length, 2);
-            var libA = lib.importedLibraries.where((l) => l.name == 'a').single;
-            expect(libA.getType('Foo'), isNotNull);
-          });
+      }, validator: (resolver) {
+        var lib = resolver.getLibrary(entryPoint);
+        expect(lib.importedLibraries.length, 2);
+        var libA = lib.importedLibraries.where((l) => l.name == 'a').single;
+        expect(libA.getType('Foo'), isNotNull);
+      });
     });
 
     test('should follow package imports', () {
-      return validateResolver(
-          inputs: {
-            'a|web/main.dart': '''
+      return validateResolver(inputs: {
+        'a|web/main.dart': '''
               import 'package:b/b.dart';
 
               main() {
               } ''',
-            'b|lib/b.dart': '''
+        'b|lib/b.dart': '''
               library b;
               ''',
-          },
-          validator: (resolver) {
-            var lib = resolver.getLibrary(entryPoint);
-            expect(lib.importedLibraries.length, 2);
-            var libB = lib.importedLibraries.where((l) => l.name == 'b').single;
-            expect(libB.getType('Foo'), isNull);
-          });
+      }, validator: (resolver) {
+        var lib = resolver.getLibrary(entryPoint);
+        expect(lib.importedLibraries.length, 2);
+        var libB = lib.importedLibraries.where((l) => l.name == 'b').single;
+        expect(libB.getType('Foo'), isNull);
+      });
     });
 
     test('handles missing files', () {
-      return validateResolver(
-          inputs: {
-            'a|web/main.dart': '''
+      return validateResolver(inputs: {
+        'a|web/main.dart': '''
               import 'package:b/missing.dart';
 
               main() {
               } ''',
-          },
-          validator: (resolver) {
-            var lib = resolver.getLibrary(entryPoint);
-            expect(lib.importedLibraries.length, 1);
-          });
+      }, validator: (resolver) {
+        var lib = resolver.getLibrary(entryPoint);
+        expect(lib.importedLibraries.length, 1);
+      });
     });
 
     test('should update on changed package imports', () {
-      return validateResolver(
-          inputs: {
-            'a|web/main.dart': '''
+      return validateResolver(inputs: {
+        'a|web/main.dart': '''
               import 'package:b/missing.dart';
 
               main() {
               } ''',
-            'b|lib/missing.dart': '''
+        'b|lib/missing.dart': '''
               library b;
               class Bar {}
               ''',
-          },
-          validator: (resolver) {
-            var lib = resolver.getLibrary(entryPoint);
-            expect(lib.importedLibraries.length, 2);
-            var libB = lib.importedLibraries.where((l) => l.name == 'b').single;
-            expect(libB.getType('Bar'), isNotNull);
-          });
+      }, validator: (resolver) {
+        var lib = resolver.getLibrary(entryPoint);
+        expect(lib.importedLibraries.length, 2);
+        var libB = lib.importedLibraries.where((l) => l.name == 'b').single;
+        expect(libB.getType('Bar'), isNotNull);
+      });
     });
 
     test('should handle deleted files', () {
-      return validateResolver(
-          inputs: {
-            'a|web/main.dart': '''
+      return validateResolver(inputs: {
+        'a|web/main.dart': '''
               import 'package:b/missing.dart';
 
               main() {
               } ''',
-          },
-          validator: (resolver) {
-            var lib = resolver.getLibrary(entryPoint);
-            expect(lib.importedLibraries.length, 1);
-          });
+      }, validator: (resolver) {
+        var lib = resolver.getLibrary(entryPoint);
+        expect(lib.importedLibraries.length, 1);
+      });
     });
 
     test('should fail on absolute URIs', () {
       var warningPrefix = 'warning: absolute paths not allowed';
-      return validateResolver(
-          inputs: {
-            'a|web/main.dart': '''
+      return validateResolver(inputs: {
+        'a|web/main.dart': '''
               import '/b.dart';
 
               main() {
               } ''',
-          },
-          messages: [
-            // First from the AST walker
-            '$warningPrefix: "/b.dart" (web/main.dart 0 14)',
-            '$warningPrefix: "/b.dart"',
-          ],
-          validator: (resolver) {
-            var lib = resolver.getLibrary(entryPoint);
-            expect(lib.importedLibraries.length, 1);
-          });
+      }, messages: [
+        // First from the AST walker
+        '$warningPrefix: "/b.dart" (web/main.dart 0 14)',
+        '$warningPrefix: "/b.dart"',
+      ], validator: (resolver) {
+        var lib = resolver.getLibrary(entryPoint);
+        expect(lib.importedLibraries.length, 1);
+      });
     });
 
     test('should list all libraries', () {
-      return validateResolver(
-          inputs: {
-            'a|web/main.dart': '''
+      return validateResolver(inputs: {
+        'a|web/main.dart': '''
               library a.main;
               import 'package:a/a.dart';
               import 'package:a/b.dart';
               export 'package:a/d.dart';
               ''',
-            'a|lib/a.dart': 'library a.a;\n import "package:a/c.dart";',
-            'a|lib/b.dart': 'library a.b;\n import "c.dart";',
-            'a|lib/c.dart': 'library a.c;',
-            'a|lib/d.dart': 'library a.d;'
-          },
-          validator: (resolver) {
-            var libs = resolver.libraries.where((l) => !l.isInSdk);
-            expect(libs.map((l) => l.name), unorderedEquals([
-              'a.main',
-              'a.a',
-              'a.b',
-              'a.c',
-              'a.d',
-            ]));
-          });
+        'a|lib/a.dart': 'library a.a;\n import "package:a/c.dart";',
+        'a|lib/b.dart': 'library a.b;\n import "c.dart";',
+        'a|lib/c.dart': 'library a.c;',
+        'a|lib/d.dart': 'library a.d;'
+      }, validator: (resolver) {
+        var libs = resolver.libraries.where((l) => !l.isInSdk);
+        expect(libs.map((l) => l.name),
+            unorderedEquals(['a.main', 'a.a', 'a.b', 'a.c', 'a.d',]));
+      });
     });
 
     test('should resolve types and library uris', () {
-      return validateResolver(
-          inputs: {
-            'a|web/main.dart': '''
+      return validateResolver(inputs: {
+        'a|web/main.dart': '''
               import 'dart:core';
               import 'package:a/a.dart';
               import 'package:a/b.dart';
               import 'sub_dir/d.dart';
               class Foo {}
               ''',
-            'a|lib/a.dart': 'library a.a;\n import "package:a/c.dart";',
-            'a|lib/b.dart': 'library a.b;\n import "c.dart";',
-            'a|lib/c.dart': '''
+        'a|lib/a.dart': 'library a.a;\n import "package:a/c.dart";',
+        'a|lib/b.dart': 'library a.b;\n import "c.dart";',
+        'a|lib/c.dart': '''
                 library a.c;
                 class Bar {}
                 ''',
-            'a|web/sub_dir/d.dart': '''
+        'a|web/sub_dir/d.dart': '''
                 library a.web.sub_dir.d;
                 class Baz{}
                 ''',
-          },
-          validator: (resolver) {
-            var a = resolver.getLibraryByName('a.a');
-            expect(a, isNotNull);
-            expect(resolver.getImportUri(a).toString(),
-                'package:a/a.dart');
-            expect(resolver.getLibraryByUri(Uri.parse('package:a/a.dart')), a);
+      }, validator: (resolver) {
+        var a = resolver.getLibraryByName('a.a');
+        expect(a, isNotNull);
+        expect(resolver.getImportUri(a).toString(), 'package:a/a.dart');
+        expect(resolver.getLibraryByUri(Uri.parse('package:a/a.dart')), a);
 
-            var main = resolver.getLibraryByName('');
-            expect(main, isNotNull);
-            expect(resolver.getImportUri(main), isNull);
+        var main = resolver.getLibraryByName('');
+        expect(main, isNotNull);
+        expect(resolver.getImportUri(main), isNull);
 
-            var fooType = resolver.getType('Foo');
-            expect(fooType, isNotNull);
-            expect(fooType.library, main);
+        var fooType = resolver.getType('Foo');
+        expect(fooType, isNotNull);
+        expect(fooType.library, main);
 
-            var barType = resolver.getType('a.c.Bar');
-            expect(barType, isNotNull);
-            expect(resolver.getImportUri(barType.library).toString(),
-                'package:a/c.dart');
-            expect(resolver.getSourceAssetId(barType),
-                new AssetId('a', 'lib/c.dart'));
+        var barType = resolver.getType('a.c.Bar');
+        expect(barType, isNotNull);
+        expect(resolver.getImportUri(barType.library).toString(),
+            'package:a/c.dart');
+        expect(
+            resolver.getSourceAssetId(barType), new AssetId('a', 'lib/c.dart'));
 
-            var bazType = resolver.getType('a.web.sub_dir.d.Baz');
-            expect(bazType, isNotNull);
-            expect(resolver.getImportUri(bazType.library), isNull);
-            expect(resolver
-                .getImportUri(bazType.library, from: entryPoint).toString(),
-                'sub_dir/d.dart');
+        var bazType = resolver.getType('a.web.sub_dir.d.Baz');
+        expect(bazType, isNotNull);
+        expect(resolver.getImportUri(bazType.library), isNull);
+        expect(
+            resolver.getImportUri(bazType.library, from: entryPoint).toString(),
+            'sub_dir/d.dart');
 
-            var hashMap = resolver.getType('dart.collection.HashMap');
-            expect(resolver.getImportUri(hashMap.library).toString(),
-                'dart:collection');
-            expect(resolver.getLibraryByUri(Uri.parse('dart:collection')),
-                hashMap.library);
-
-          });
+        var hashMap = resolver.getType('dart.collection.HashMap');
+        expect(resolver.getImportUri(hashMap.library).toString(),
+            'dart:collection');
+        expect(resolver.getLibraryByUri(Uri.parse('dart:collection')),
+            hashMap.library);
+      });
     });
 
     test('deleted files should be removed', () {
       return validateResolver(
           inputs: {
-            'a|web/main.dart': '''import 'package:a/a.dart';''',
-            'a|lib/a.dart': '''import 'package:a/b.dart';''',
-            'a|lib/b.dart': '''class Engine{}''',
-          },
+        'a|web/main.dart': '''import 'package:a/a.dart';''',
+        'a|lib/a.dart': '''import 'package:a/b.dart';''',
+        'a|lib/b.dart': '''class Engine{}''',
+      },
           validator: (resolver) {
-            var engine = resolver.getType('Engine');
-            var uri = resolver.getImportUri(engine.library);
-            expect(uri.toString(), 'package:a/b.dart');
-          }).then((_) {
-            return validateResolver(
-              inputs: {
-                'a|web/main.dart': '''import 'package:a/a.dart';''',
-                'a|lib/a.dart': '''lib a;\n class Engine{}'''
-              },
-              validator: (resolver) {
-                var engine = resolver.getType('Engine');
-                var uri = resolver.getImportUri(engine.library);
-                expect(uri.toString(), 'package:a/a.dart');
+        var engine = resolver.getType('Engine');
+        var uri = resolver.getImportUri(engine.library);
+        expect(uri.toString(), 'package:a/b.dart');
+      }).then((_) {
+        return validateResolver(
+            inputs: {
+          'a|web/main.dart': '''import 'package:a/a.dart';''',
+          'a|lib/a.dart': '''lib a;\n class Engine{}'''
+        },
+            validator: (resolver) {
+          var engine = resolver.getType('Engine');
+          var uri = resolver.getImportUri(engine.library);
+          expect(uri.toString(), 'package:a/a.dart');
 
-                // Make sure that we haven't leaked any sources.
-                expect(resolver.sources.length, 2);
-              });
-          });
+          // Make sure that we haven't leaked any sources.
+          expect(resolver.sources.length, 2);
+        });
+      });
     });
 
     test('handles circular imports', () {
-      return validateResolver(
-          inputs: {
-            'a|web/main.dart': '''
+      return validateResolver(inputs: {
+        'a|web/main.dart': '''
                 library main;
                 import 'package:a/a.dart'; ''',
-            'a|lib/a.dart': '''
+        'a|lib/a.dart': '''
                 library a;
                 import 'package:a/b.dart'; ''',
-            'a|lib/b.dart': '''
+        'a|lib/b.dart': '''
                 library b;
                 import 'package:a/a.dart'; ''',
-          },
-          validator: (resolver) {
-            var libs = resolver.libraries.map((lib) => lib.name);
-            expect(libs.contains('a'), isTrue);
-            expect(libs.contains('b'), isTrue);
-          });
+      }, validator: (resolver) {
+        var libs = resolver.libraries.map((lib) => lib.name);
+        expect(libs.contains('a'), isTrue);
+        expect(libs.contains('b'), isTrue);
+      });
     });
 
     test('handles parallel resolves', () {
       return Future.wait([
-        validateResolver(
-          inputs: {
-            'a|web/main.dart': '''
+        validateResolver(inputs: {
+          'a|web/main.dart': '''
                 library foo;'''
-          },
-          validator: (resolver) {
-            expect(resolver.getLibrary(entryPoint).name, 'foo');
-          }),
-        validateResolver(
-          inputs: {
-            'a|web/main.dart': '''
+        }, validator: (resolver) {
+          expect(resolver.getLibrary(entryPoint).name, 'foo');
+        }),
+        validateResolver(inputs: {
+          'a|web/main.dart': '''
                 library bar;'''
-          },
-          validator: (resolver) {
-            expect(resolver.getLibrary(entryPoint).name, 'bar');
-          }),
+        }, validator: (resolver) {
+          expect(resolver.getLibrary(entryPoint).name, 'bar');
+        }),
       ]);
     });
   });