Switch transformers over to source_span

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,
        EvaluationResult;
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/sdk.dart' show DartSdk;
 import 'package:analyzer/src/generated/source.dart';
 import 'package:barback/barback.dart';
 import 'package:code_transformers/assets.dart';
 import 'package:path/path.dart' as native_path;
 import 'package:source_maps/refactor.dart';
-import 'package:source_maps/span.dart' show SourceFile, Span;
+import 'package:source_span/source_span.dart';
 
 import 'resolver.dart';
 import 'dart_sdk.dart' show UriAnnotatedSource;
 
 // We should always be using url paths here since it's always Dart/pub code.
 final path = native_path.url;
 
 /// Resolves and updates an AST based on Barback-based assets.
 ///
 /// This also provides a handful of useful APIs for traversing and working
@@ skipping 216 matching lines @@
     // Should not be able to encounter any other source types.
     throw new StateError('Unable to resolve URI for ${source.runtimeType}');
   }
 
   AssetId getSourceAssetId(Element element) {
     var source = element.source;
     if (source is _AssetBasedSource) return source.assetId;
     return null;
   }
 
-  Span getSourceSpan(Element element) {
+  SourceSpan getSourceSpan(Element element) {
     var sourceFile = getSourceFile(element);
     if (sourceFile == null) return null;
     return sourceFile.span(element.node.offset, element.node.end);
   }
 
   TextEditTransaction createTextEditTransaction(Element element) {
     if (element.source is! _AssetBasedSource) return null;
 
     // Cannot edit unless there is an active transformer.
     if (_currentTransform == null) return null;
@@ skipping 10 matching lines @@
     return new TextEditTransaction(source.rawContents, sourceFile);
   }
 
   /// Gets the SourceFile for the source of the element.
   SourceFile getSourceFile(Element element) {
     var assetId = getSourceAssetId(element);
     if (assetId == null) return null;
 
     var importUri = _getSourceUri(element);
     var spanPath = importUri != null ? importUri.toString() : assetId.path;
-    return new SourceFile.text(spanPath, sources[assetId].rawContents);
+    return new SourceFile(sources[assetId].rawContents, url: spanPath);
   }
 }
 
 /// 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.
@@ skipping 84 matching lines @@
 
     // 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;
   }
 
   /// For logging errors.
-  Span _getSpan(AstNode node, [String contents]) =>
+  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.text(path, contents != null ? contents : rawContents);
+    return new SourceFile(contents != null ? contents : rawContents, url: path);
   }
 
   /// Gets a URI which would be appropriate for importing this file.
   ///
   /// Note that this file may represent a non-importable file such as a part.
   Uri getSourceUri([AssetId from]) {
     if (!assetId.path.startsWith('lib/')) {
       // Cannot do absolute imports of non lib-based assets.
       if (from == null) return null;
 
@@ skipping 31 matching lines @@
       throw new UnsupportedError('fromEncoding is not supported');
 
   Uri restoreAbsolute(Source source) =>
       throw new UnsupportedError('restoreAbsolute is not supported');
 
   TransformLogger get logger => _resolver._currentTransform.logger;
 }
 
 /// Get an asset ID for a URL relative to another source asset.
 AssetId _resolve(AssetId source, String url, TransformLogger logger,
-    Span span) {
+    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') {
     uri = Uri.parse('package:${uri.pathSegments.skip(1).join(path.separator)}');
   }
 
@@ skipping 77 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);
     }
   }
 }