Switch transformers over to source_span

pkg/polymer/lib/src/build/script_compactor.dart

 // Copyright (c) 2013, 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.
 
 /// Transfomer that combines multiple dart script tags into a single one.
 library polymer.src.build.script_compactor;
 
 import 'dart:async';
 import 'dart:convert';
 
 import 'package:html5lib/dom.dart' show Document, Element, Text;
 import 'package:html5lib/dom_parsing.dart';
 import 'package:html5lib/parser.dart' show parseFragment;
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/element.dart' hide Element;
 import 'package:analyzer/src/generated/element.dart' as analyzer show Element;
 import 'package:barback/barback.dart';
 import 'package:path/path.dart' as path;
-import 'package:source_maps/span.dart' show SourceFile, Span;
+import 'package:source_span/source_span.dart';
 import 'package:smoke/codegen/generator.dart';
 import 'package:smoke/codegen/recorder.dart';
 import 'package:code_transformers/resolver.dart';
 import 'package:code_transformers/src/dart_sdk.dart';
 import 'package:template_binding/src/mustache_tokens.dart' show MustacheTokens;
 
 import 'package:polymer_expressions/expression.dart' as pe;
 import 'package:polymer_expressions/parser.dart' as pe;
 import 'package:polymer_expressions/visitor.dart' as pe;
 
@@ skipping 465 matching lines @@
   final AssetId assetId;
   final String tagName;
   final String typeName;
   String get symbolName => typeName;
   _CustomTagInitializer(this.assetId, this.tagName, this.typeName);
 
   String asCode(String prefix) =>
       "() => Polymer.register('$tagName', $prefix.$typeName)";
 }
 
 _getSpan(SourceFile file, AstNode node) => file.span(node.offset, node.end);

[Siggi Cherem (dart-lang), 2014/07/29 23:41:37]

let's delete this line

[nweiz, 2014/07/29 23:48:39]

Done.

 
 const MAIN_HEADER = """
 library app_bootstrap;
 
 import 'package:polymer/polymer.dart';
 """;
 
 const NO_INITIALIZERS_ERROR =
     'No polymer initializers were found. Make sure to either '
     'annotate your polymer elements with @CustomTag or include a '
@@ skipping 72 matching lines @@
             tag == 'select' && (name == 'selectedindex' || name == 'value') ||
             tag == 'textarea' && name == 'value');
       }
       for (var exp in bindings.expressions) {
         _addExpression(exp, isEvent, isTwoWay, node.sourceSpan);
       }
     });
   }
 
   void _addExpression(String stringExpression, bool inEvent, bool isTwoWay,
-      Span span) {
+      SourceSpan span) {
 
     if (inEvent) {
       if (stringExpression.startsWith('@')) {
         logger.warning('event bindings with @ are no longer supported',
             span: span);
         return;
       }
 
       if (stringExpression == '') return;
       if (stringExpression.startsWith('_')) {
         logger.warning('private symbols cannot be used in event handlers',
             span: span);
         return;
       }
       generator.addGetter(stringExpression);
       generator.addSymbol(stringExpression);
     }
     expressionVisitor.run(pe.parse(stringExpression), isTwoWay, span);
   }
 }
 
 /// A polymer-expression visitor that records every getter and setter that will
 /// be needed to evaluate a single expression at runtime.
 class _SubExpressionVisitor extends pe.RecursiveVisitor {
   final SmokeCodeGenerator generator;
   final TransformLogger logger;
   bool _includeSetter;
-  Span _currentSpan;
+  SourceSpan _currentSpan;
 
   _SubExpressionVisitor(this.generator, this.logger);
 
   /// Visit [exp], and record getters and setters that are needed in order to
   /// evaluate it at runtime. [includeSetter] is only true if this expression
   /// occured in a context where it could be updated, for example in two-way
   /// bindings such as `<input value={{exp}}>`.
   void run(pe.Expression exp, bool includeSetter, span) {
     _currentSpan = span;
     _includeSetter = includeSetter;
@@ skipping 188 matching lines @@
   for (var c in combinators) {
     if (c is ShowElementCombinator) {
       var show = c.shownNames.toSet();
       elements.retainWhere((e) => show.contains(e.displayName));
     } else if (c is HideElementCombinator) {
       var hide = c.hiddenNames.toSet();
       elements.removeWhere((e) => hide.contains(e.displayName));
     }
   }
 }