Scan generic method comments with Fasta.

pkg/analyzer/lib/src/fasta/token_utils.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.token_utils;
 
 import 'package:front_end/src/fasta/scanner/error_token.dart' show ErrorToken;
 
 import 'package:front_end/src/fasta/scanner/keyword.dart' show Keyword;
 
@@ skipping 149 matching lines @@
         token.endGroup != null &&
         token.endGroup.charOffset != token.charOffset) {
       _beginTokenStack.add(translatedToken);
       _endTokenStack.add(token.endGroup);
     }
   }
 }
 
 /// Converts a single Fasta comment token to an analyzer comment token.
 analyzer.CommentToken toAnalyzerCommentToken(Token token) {
-  // TODO(paulberry,ahe): It would be nice if the scanner gave us an
-  // easier way to distinguish between the two types of comment.
-  var type = token.lexeme.startsWith('/*')
-      ? TokenType.MULTI_LINE_COMMENT
-      : TokenType.SINGLE_LINE_COMMENT;
+  TokenType type;
+  if (token.type == GENERIC_METHOD_TYPE_ASSIGN) {
+    type = TokenType.GENERIC_METHOD_TYPE_ASSIGN;
+  } else if (token.type == GENERIC_METHOD_TYPE_LIST) {
+    type = TokenType.GENERIC_METHOD_TYPE_LIST;
+  } else {
+    // TODO(paulberry,ahe): It would be nice if the scanner gave us an
+    // easier way to distinguish between the two types of comment.
+    type = token.lexeme.startsWith('/*')
+        ? TokenType.MULTI_LINE_COMMENT
+        : TokenType.SINGLE_LINE_COMMENT;
+  }
   return new analyzer.CommentToken(type, token.lexeme, token.charOffset);
 }
 
 /// Converts a stream of Analyzer tokens (starting with [token] and continuing
 /// to EOF) to a stream of Fasta tokens.
 ///
 /// TODO(paulberry): Analyzer tokens do not record error conditions, so a round
 /// trip through this function and [toAnalyzerTokenStream] will lose error
 /// information.
 Token fromAnalyzerTokenStream(analyzer.Token analyzerToken) {
@@ skipping 539 matching lines @@
     case TILDE_SLASH_TOKEN:
       return TokenType.TILDE_SLASH;
     case TILDE_SLASH_EQ_TOKEN:
       return TokenType.TILDE_SLASH_EQ;
     case BACKPING_TOKEN:
       return TokenType.BACKPING;
     case BACKSLASH_TOKEN:
       return TokenType.BACKSLASH;
     case PERIOD_PERIOD_PERIOD_TOKEN:
       return TokenType.PERIOD_PERIOD_PERIOD;
-    // case GENERIC_METHOD_TYPE_LIST_TOKEN:
-    //   return TokenType.GENERIC_METHOD_TYPE_LIST;
-    // case GENERIC_METHOD_TYPE_ASSIGN_TOKEN:
-    //   return TokenType.GENERIC_METHOD_TYPE_ASSIGN;
+    case GENERIC_METHOD_TYPE_LIST_TOKEN:
+      return TokenType.GENERIC_METHOD_TYPE_LIST;
+    case GENERIC_METHOD_TYPE_ASSIGN_TOKEN:
+      return TokenType.GENERIC_METHOD_TYPE_ASSIGN;
     default:
       return internalError("Unhandled token ${token.info}");
   }
 }