more work aligning fasta.Token with analyzer.Token

pkg/front_end/lib/src/fasta/testing/validating_instrumentation.dart

 // Copyright (c) 2017, 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.md file.
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
 import 'package:front_end/src/base/instrumentation.dart';
 import 'package:front_end/src/fasta/messages.dart';
 import 'package:front_end/src/fasta/scanner.dart';
 import 'package:front_end/src/fasta/scanner/io.dart';
+import 'package:front_end/src/scanner/token.dart' as analyzer;
 
 /// Implementation of [Instrumentation] which checks property/value pairs
 /// against expectations encoded in source files using "/*@...*/" comments.
 class ValidatingInstrumentation implements Instrumentation {
   static final _ESCAPE_SEQUENCE = new RegExp(r'\\(.)');
 
   /// Map from feature names to the property names they are short for.
   static const _FEATURES = const {
     'inference': const [
       'topType',
@@ skipping 70 matching lines @@
 
   /// Loads expectations from the source file located at [uri].
   ///
   /// Should be called before [finish].
   Future<Null> loadExpectations(Uri uri) async {
     var bytes = await readBytesFromFile(uri);
     var expectations = _unsatisfiedExpectations.putIfAbsent(uri, () => {});
     var testedFeaturesState = _testedFeaturesState.putIfAbsent(uri, () => {});
     ScannerResult result = scan(bytes, includeComments: true);
     for (Token token = result.tokens; !token.isEof; token = token.next) {
-      for (Token commentToken = token.precedingCommentTokens;
+      for (analyzer.Token commentToken = token.precedingComments;
           commentToken != null;
           commentToken = commentToken.next) {
         String lexeme = commentToken.lexeme;
         if (lexeme.startsWith('/*@') && lexeme.endsWith('*/')) {
           var expectation = lexeme.substring(3, lexeme.length - 2);
           var equals = expectation.indexOf('=');
           String property;
           String value;
           if (equals == -1) {
             property = expectation;
@@ skipping 108 matching lines @@
       this.property, this.value, this.commentOffset, this.commentLength);
 }
 
 class _Fix {
   final int offset;
   final int length;
   final String replacement;
 
   _Fix(this.offset, this.length, this.replacement);
 }