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 98 matching lines @@
     var visited = new Set<AssetId>();
     var visiting = new FutureGroup();
     var toUpdate = [];
 
     void processAsset(AssetId assetId) {
       visited.add(assetId);
 
       visiting.add(transform.readInputAsString(assetId).then((contents) {
         var source = sources[assetId];
         if (source == null) {
-          source = new _AssetBasedSource(assetId, this);
+          // TODO(scheglov) how to get Uri here?

[Siggi Cherem (dart-lang), 2014/08/04 22:43:55]

You might be able to basically use the logic we have in
_AssetBasedSource.getSourceUri

one question I have is what is this Uri supposed to look like? Is it supposed to
be the fully resolved Uri, the string was found when loading this asset in the
first place?

+          Uri uri = null;
+          source = new _AssetBasedSource(assetId, this, uri);
           sources[assetId] = source;
         }
         source.updateDependencies(contents);
         toUpdate.add(new _PendingUpdate(source, contents));
         source.dependentAssets.where((id) => !visited.contains(id))
             .forEach(processAsset);
       }, onError: (e) {
         var source = sources[assetId];
         if (source != null && source.exists()) {
           _context.applyChanges(
@@ skipping 161 matching lines @@
 
 /// Implementation of Analyzer's Source for Barback based assets.
 class _AssetBasedSource extends Source {
 
   /// Asset ID where this source can be found.
   final AssetId assetId;
 
   /// The resolver this is being used in.
   final ResolverImpl _resolver;
 
+  /// The URI from which this source was originally derived.
+  final Uri uri;
+
   /// Cache of dependent asset IDs, to avoid re-parsing the AST.
   Iterable<AssetId> _dependentAssets;
 
   /// The current revision of the file, incremented only when file changes.
   int _revision = 0;
 
   /// The file contents.
   String _contents;
 
-  _AssetBasedSource(this.assetId, this._resolver);
+  _AssetBasedSource(this.assetId, this._resolver, this.uri);
 
   /// Update the dependencies of this source. This parses [contents] but avoids
   /// any analyzer resolution.
   void updateDependencies(String contents) {
     if (contents == _contents) return;
     var unit = parseDirectives(contents, suppressErrors: true);
     _dependentAssets = unit.directives
         .where((d) => (d is ImportDirective || d is PartDirective ||
             d is ExportDirective))
         .map((d) => _resolve(assetId, d.uri.stringValue, _logger,
@@ skipping 49 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;
 
     // 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 24 matching lines @@
   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;
     }
     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);
+      source = new _AssetBasedSource(assetId, _resolver, uri);

[Siggi Cherem (dart-lang), 2014/08/04 22:43:55]

if this is intended to be the resolved uri, then I wonder is 'uri' guaranteed to
be resolved at this point, or should we also use getSourceUri here?

In that case, I'd remove the constructor argument and set 'uri' internaly via
getSourceUri.

       _resolver.sources[assetId] = source;
     }
     return source;
   }
 
   Source fromEncoding(UriKind kind, Uri uri) =>
       throw new UnsupportedError('fromEncoding is not supported');
 
   Uri restoreAbsolute(Source source) =>
       throw new UnsupportedError('restoreAbsolute is not supported');
@@ skipping 94 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);
     }
   }
 }