Breaking changes in 'analyzer' package.

pkg/code_transformers/lib/src/resolver_impl.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 code_transformer.src.resolver_impl;
 
 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,
@@ skipping 324 matching lines @@
   /// Contents of the file.
   TimestampedData<String> get contents {
     if (!exists()) throw new StateError('$assetId does not exist');
 
     return new TimestampedData<String>(modificationStamp, _contents);
   }
 
   /// Contents of the file.
   String get rawContents => _contents;
 
+  Uri get uri => Uri.parse('asset:${assetId.package}/${assetId.path}');
+
   /// Logger for the current transform.
   ///
   /// Only valid while the resolver is updating assets.
   TransformLogger get _logger => _resolver._currentTransform.logger;
 
   /// Gets all imports/parts/exports which resolve to assets (non-Dart files).
   Iterable<AssetId> get dependentAssets => _dependentAssets;
 
   bool exists() => _contents != null;
 
@@ skipping 15 matching lines @@
 
   String get shortName => path.basename(assetId.path);
 
   UriKind get uriKind {
     if (assetId.path.startsWith('lib/')) return UriKind.PACKAGE_URI;
     return UriKind.FILE_URI;
   }
 
   bool get isInSystemLibrary => false;
 
-  Source resolveRelative(Uri relativeUri) {
+  Uri resolveRelative(Uri relativeUri) {
     var id = _resolve(assetId, relativeUri.toString(), _logger, null);
-    if (id == null) return null;
+    if (id == null) return uri.resolveUri(relativeUri);
 
     // The entire AST should have been parsed and loaded at this point.
     var source = _resolver.sources[id];
     if (source == null) {
       _logger.error('Could not load asset $id');
     }
-    return source;
+    return source.uri;
   }
 
   /// For logging errors.
   SourceSpan _getSpan(AstNode node, [String contents]) =>
       _getSourceFile(contents).span(node.offset, node.end);
   /// For logging errors.
   SourceFile _getSourceFile([String contents]) {
     var uri = getSourceUri();
     var path = uri != null ? uri.toString() : assetId.path;
     return new SourceFile(contents != null ? contents : rawContents, url: path);
@@ skipping 15 matching lines @@
     return Uri.parse('package:${assetId.package}/${assetId.path.substring(4)}');
   }
 }
 
 /// Implementation of Analyzer's UriResolver for Barback based assets.
 class _AssetUriResolver implements UriResolver {
   final ResolverImpl _resolver;
   _AssetUriResolver(this._resolver);
 
   Source resolveAbsolute(Uri uri) {
-    var assetId = _resolve(null, uri.toString(), logger, null);
-    if (assetId == null) {
-      logger.error('Unable to resolve asset ID for "$uri"');
-      return null;
+    assert(uri.scheme != 'dart');
+    var assetId;
+    if (uri.scheme == 'asset') {
+      var parts = path.split(uri.path);
+      assetId = new AssetId(parts[0], path.joinAll(parts.skip(1)));
+    } else {
+      assetId = _resolve(null, uri.toString(), logger, null);
+      if (assetId == null) {
+        logger.error('Unable to resolve asset ID for "$uri"');
+        return null;
+      }
     }
     var source = _resolver.sources[assetId];
     // Analyzer expects that sources which are referenced but do not exist yet
     // still exist, so just make an empty source.
     if (source == null) {
       source = new _AssetBasedSource(assetId, _resolver);
       _resolver.sources[assetId] = source;
     }
     return source;
   }
@@ skipping 100 matching lines @@
 
   void apply(ChangeSet changeSet) {
     if (!source.updateContents(content)) return;
     if (source._revision == 1 && source._contents != null) {
       changeSet.addedSource(source);
     } else {
       changeSet.changedSource(source);
     }
   }
 }