more work aligning fasta.Token with analyzer.Token

pkg/front_end/test/scanner_fasta_test.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 file.
 
 import 'package:analyzer/src/fasta/token_utils.dart';
 import 'package:front_end/src/fasta/scanner/error_token.dart' as fasta;
 import 'package:front_end/src/fasta/scanner/string_scanner.dart' as fasta;
 import 'package:front_end/src/fasta/scanner/token.dart' as fasta;
 import 'package:front_end/src/fasta/scanner/token_constants.dart' as fasta;
 import 'package:front_end/src/scanner/errors.dart';
@@ skipping 135 matching lines @@
     fasta.Token token;
     fasta.CommentToken c1;
     fasta.CommentToken c2;
     fasta.CommentToken c3;
 
     void prepareTokens() {
       token = new fasta.StringScanner(code, includeComments: true).tokenize();
 
       expect(token.type.kind, fasta.IDENTIFIER_TOKEN);
 
-      c1 = token.precedingCommentTokens;
+      c1 = token.precedingComments;
       c2 = c1.next;
       c3 = c2.next;
       expect(c3.next, isNull);
 
       expect(c1.parent, token);
       expect(c2.parent, token);
       expect(c3.parent, token);
 
       expect(c1.lexeme, '/// aaa');
       expect(c2.lexeme, '/// bbbb');
       expect(c3.lexeme, '/// ccccc');
     }
 
     // Remove the first token.
     {
       prepareTokens();
       c1.remove();
-      expect(token.precedingCommentTokens, c2);
+      expect(token.precedingComments, c2);
       expect(c2.next, c3);
       expect(c3.next, isNull);
     }
 
     // Remove the second token.
     {
       prepareTokens();
       c2.remove();
-      expect(token.precedingCommentTokens, c1);
+      expect(token.precedingComments, c1);
       expect(c1.next, c3);
       expect(c3.next, isNull);
     }
 
     // Remove the last token.
     {
       prepareTokens();
       c3.remove();
-      expect(token.precedingCommentTokens, c1);
+      expect(token.precedingComments, c1);
       expect(c1.next, c2);
       expect(c2.next, isNull);
     }
   }
 
   @override
   @failingTest
   void test_incomplete_string_interpolation() {
     // TODO(danrubel): fix ToAnalyzerTokenStreamConverter_WithListener
     // to handle synthetic closers in token stream
@@ skipping 38 matching lines @@
     expect(openParen1.endToken, same(closeParen1));
     expect(openBrace.endToken, same(closeBrace));
     expect(openParen2.endToken, same(closeParen2));
   }
 
   void test_next_previous() {
     const source = 'int a; /*1*/ /*2*/ /*3*/ B f(){if (a < 2) {}}';
     fasta.Token token =
         new fasta.StringScanner(source, includeComments: true).tokenize();
     while (!token.isEof) {
-      expect(token.next.previousToken, token);
+      expect(token.next.previous, token);
       fasta.CommentToken commentToken = token.precedingComments;
       while (commentToken != null) {
         if (commentToken.next != null) {
-          expect(commentToken.next.previousToken, commentToken);
+          expect(commentToken.next.previous, commentToken);
         }
         commentToken = commentToken.next;
       }
       token = token.next;
     }
   }
 
   @override
   @failingTest
   void test_string_multi_unterminated() {
@@ skipping 290 matching lines @@
   final ErrorListener _listener;
 
   ToAnalyzerTokenStreamConverter_WithListener(this._listener);
 
   @override
   void reportError(
       ScannerErrorCode errorCode, int offset, List<Object> arguments) {
     _listener.errors.add(new TestError(offset, errorCode, arguments));
   }
 }