New tests and improvements for generics in comments parsing.

pkg/analyzer/lib/src/fasta/ast_builder.dart

 // Copyright (c) 2016, 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 fasta.analyzer.ast_builder;
 
 import 'package:analyzer/analyzer.dart';
 import 'package:analyzer/dart/ast/ast_factory.dart' show AstFactory;
 import 'package:analyzer/dart/ast/standard_ast_factory.dart' as standard;
 import 'package:analyzer/dart/ast/token.dart' as analyzer show Token;
@@ skipping 1920 matching lines @@
     Token injected = injectGenericCommentTypeAssign(tokenWithComment);
     if (!identical(injected, tokenWithComment)) {
       Token prev = tokenToStartReplacing.previous;
       prev.setNextWithoutSettingPrevious(injected);
       tokenToStartReplacing = injected;
       tokenToStartReplacing.previous = prev;
     }
     return tokenToStartReplacing;
   }
 
+  @override
+  void discardTypeReplacedWithCommentTypeAssign() {

[Paul Berry, 2017/05/01 18:24:42]

Do we need to add a similar override to BodyBuilder?  (To handle '/*=Type*/'
appearing inside a method body)

+    pop();
+  }
+
   /// Check if the given [token] has a comment token with the given [info],
   /// which should be either [TokenType.GENERIC_METHOD_TYPE_ASSIGN] or
   /// [TokenType.GENERIC_METHOD_TYPE_LIST].  If found, parse the comment
   /// into tokens and inject into the token stream before the [token].
   Token _injectGenericComment(Token token, TokenType info, int prefixLen) {
     if (parseGenericMethodComments) {
       CommentToken t = token.precedingCommentTokens;
       for (; t != null; t = t.next) {
         if (t.info == info) {
           String code = t.lexeme.substring(prefixLen, t.lexeme.length - 2);
@@ skipping 130 matching lines @@
       } else if (identical('static', s)) {
         staticKeyword = token;
       } else if (identical('var', s)) {
         finalConstOrVarKeyword = token;
       } else {
         internalError('Unhandled modifier: $s');
       }
     }
   }
 }