AST changes necessary for generic method support

pkg/analyzer/lib/src/generated/incremental_resolver.dart

 // Copyright (c) 2014, 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 engine.incremental_resolver;
 
 import 'dart:collection';
 import 'dart:math' as math;
 
 import 'package:analyzer/src/context/cache.dart'
@@ skipping 502 matching lines @@
       return _assertEquals(elements.length, 0);
     }
     List<FormalParameter> parameters = nodes.parameters;
     int length = parameters.length;
     _assertEquals(length, elements.length);
     for (int i = 0; i < length; i++) {
       _assertCompatibleParameter(parameters[i], elements[i]);
     }
   }
 
+  /**
+   * Asserts that there is an import with the same prefix as the given
+   * [prefixNode], which exposes the given [element].
+   */
+  void _assertElementVisibleWithPrefix(
+      SimpleIdentifier prefixNode, Element element) {
+    if (prefixNode == null) {
+      return;
+    }
+    String prefixName = prefixNode.name;
+    for (ImportElement import in _enclosingLibrary.imports) {
+      if (import.prefix != null && import.prefix.name == prefixName) {
+        Namespace namespace =
+            new NamespaceBuilder().createImportNamespaceForDirective(import);
+        Iterable<Element> visibleElements = namespace.definedNames.values;
+        if (visibleElements.contains(element)) {
+          return;
+        }
+      }
+    }
+    _assertTrue(false);
+  }
+
   void _assertEquals(Object a, Object b) {
     if (a != b) {
       throw new _DeclarationMismatchException();
     }
   }
 
   void _assertFalse(bool condition) {
     if (condition) {
       throw new _DeclarationMismatchException();
     }
@@ skipping 79 matching lines @@
       _assertEquals(nodeName, 'void');
     } else if (type.isDynamic) {
       _assertEquals(nodeName, 'dynamic');
     } else {
       // TODO(scheglov) support other types
       logger.log('node: $node type: $type  type.type: ${type.runtimeType}');
       _assertTrue(false);
     }
   }
 
-  /**
-   * Asserts that there is an import with the same prefix as the given
-   * [prefixNode], which exposes the given [element].
-   */
-  void _assertElementVisibleWithPrefix(
-      SimpleIdentifier prefixNode, Element element) {
-    if (prefixNode == null) {
-      return;
-    }
-    String prefixName = prefixNode.name;
-    for (ImportElement import in _enclosingLibrary.imports) {
-      if (import.prefix != null && import.prefix.name == prefixName) {
-        Namespace namespace =
-            new NamespaceBuilder().createImportNamespaceForDirective(import);
-        Iterable<Element> visibleElements = namespace.definedNames.values;
-        if (visibleElements.contains(element)) {
-          return;
-        }
-      }
-    }
-    _assertTrue(false);
-  }
-
   void _assertSameTypeParameter(
       TypeParameter node, TypeParameterElement element) {
     _assertSameType(node.bound, element.bound);
   }
 
   void _assertSameTypeParameters(
       TypeParameterList nodesList, List<TypeParameterElement> elements) {
     if (nodesList == null) {
       return _assertEquals(elements.length, 0);
     }
@@ skipping 809 matching lines @@
     }
     return false;
   }
 
   CompilationUnit _parseUnit(String code) {
     LoggingTimer timer = logger.startTimer();
     try {
       Token token = _scan(code);
       RecordingErrorListener errorListener = new RecordingErrorListener();
       Parser parser = new Parser(_unitSource, errorListener);
+      AnalysisOptions options = _unitElement.context.analysisOptions;
+      parser.parseGenericMethods = options.enableGenericMethods;
       CompilationUnit unit = parser.parseCompilationUnit(token);
       _newParseErrors = errorListener.errors;
       return unit;
     } finally {
       timer.stop('parse');
     }
   }
 
   /**
    * Attempts to resolve a documentation comment change.
@@ skipping 510 matching lines @@
   @override
   String toString() => name;
 }
 
 class _TokenPair {
   final _TokenDifferenceKind kind;
   final Token oldToken;
   final Token newToken;
   _TokenPair(this.kind, this.oldToken, this.newToken);
 }