Make ExecutableElementImpl implement TypeParameterizedElementMixin.

pkg/analyzer/lib/src/dart/element/element.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 analyzer.src.dart.element.element;
 
 import 'dart:collection';
 import 'dart:math' show min;
 
 import 'package:analyzer/dart/ast/ast.dart';
@@ skipping 1593 matching lines @@
    * Set whether this constructor represents a 'const' constructor.
    */
   void set const2(bool isConst) {
     assert(serializedExecutable == null);
     setModifier(Modifier.CONST, isConst);
   }
 
   @override
   ClassElement get enclosingElement => super.enclosingElement as ClassElement;
 
+  @override
+  TypeParameterizedElementMixin get enclosingTypeParameterContext =>
+      super.enclosingElement as ClassElementImpl;
+
   /**
    * Set whether this constructor represents a factory method.
    */
   void set factory(bool isFactory) {
     assert(serializedExecutable == null);
     setModifier(Modifier.FACTORY, isFactory);
   }
 
   @override
   bool get isConst {
@@ skipping 1061 matching lines @@
       }
       buffer.writeCharCode(currentChar);
     }
   }
 }
 
 /**
  * A base class for concrete implementations of an [ExecutableElement].
  */
 abstract class ExecutableElementImpl extends ElementImpl
+    with TypeParameterizedElementMixin
     implements ExecutableElement {
   /**
    * The unlinked representation of the executable in the summary.
    */
   final UnlinkedExecutable serializedExecutable;
 
   /**
    * A list containing all of the functions defined within this executable
    * element.
    */
@@ skipping 267 matching lines @@
    * [typeParameters].
    */
   void set typeParameters(List<TypeParameterElement> typeParameters) {
     for (TypeParameterElement parameter in typeParameters) {
       (parameter as TypeParameterElementImpl).enclosingElement = this;
     }
     this._typeParameters = typeParameters;
   }
 
   @override
+  List<UnlinkedTypeParam> get unlinkedTypeParams =>
+      serializedExecutable.typeParameters;
+
+  @override
   void appendTo(StringBuffer buffer) {
     if (this.kind != ElementKind.GETTER) {
       int typeParameterCount = _typeParameters.length;
       if (typeParameterCount > 0) {
         buffer.write('<');
         for (int i = 0; i < typeParameterCount; i++) {
           if (i > 0) {
             buffer.write(", ");
           }
           (_typeParameters[i] as TypeParameterElementImpl).appendTo(buffer);
@@ skipping 252 matching lines @@
       List<ParameterElement> parameters, DartType returnType)
       : super("", -1) {
     synthetic = true;
     this.returnType = returnType;
     this.parameters = parameters;
 
     type = new FunctionTypeImpl(this);
   }
 
   @override
+  TypeParameterizedElementMixin get enclosingTypeParameterContext {
+    Element enclosingElement = this.enclosingElement;
+    if (enclosingElement is TypeParameterizedElementMixin) {
+      return enclosingElement;
+    }
+    return null;
+  }
+
+  @override
   String get identifier {
     String identifier = super.identifier;
     if (!isStatic) {
       identifier += "@$nameOffset";
     }
     return identifier;
   }
 
   @override
   bool get isEntryPoint {
@@ skipping 1277 matching lines @@
     if ("unary-" == displayName) {
       return "-";
     }
     return displayName;
   }
 
   @override
   ClassElement get enclosingElement => super.enclosingElement as ClassElement;
 
   @override
+  TypeParameterizedElementMixin get enclosingTypeParameterContext =>
+      super.enclosingElement as ClassElementImpl;
+
+  @override
   bool get isOperator {
     String name = displayName;
     if (name.isEmpty) {
       return false;
     }
     int first = name.codeUnitAt(0);
     return !((0x61 <= first && first <= 0x7A) ||
         (0x41 <= first && first <= 0x5A) ||
         first == 0x5F ||
         first == 0x24);
@@ skipping 417 matching lines @@
    * element.
    */
   List<ExecutableElement> _elements = PropertyAccessorElement.EMPTY_LIST;
 
   MultiplyInheritedPropertyAccessorElementImpl(Identifier name)
       : super.forNode(name) {
     synthetic = true;
   }
 
   @override
+  TypeParameterizedElementMixin get enclosingTypeParameterContext => null;
+
+  @override
   List<ExecutableElement> get inheritedElements => _elements;
 
   void set inheritedElements(List<ExecutableElement> elements) {
     this._elements = elements;
   }
 }
 
 /**
  * A [VariableElementImpl], which is not a parameter.
  */
@@ skipping 557 matching lines @@
   @override
   String get displayName {
     if (serializedExecutable != null && isSetter) {
       String name = serializedExecutable.name;
       assert(name.endsWith('='));
       return name.substring(0, name.length - 1);
     }
     return super.displayName;
   }
 
+  @override
+  TypeParameterizedElementMixin get enclosingTypeParameterContext {
+    Element enclosingElement = this.enclosingElement;
+    if (enclosingElement is TypeParameterizedElementMixin) {
+      return enclosingElement;
+    }
+    return null;
+  }
+
   /**
    * Set whether this accessor is a getter.
    */
   void set getter(bool isGetter) {
     assert(serializedExecutable == null);
     setModifier(Modifier.GETTER, isGetter);
   }
 
   @override
   int get hashCode => JenkinsSmiHash.hash2(super.hashCode, isGetter ? 1 : 2);
@@ skipping 721 matching lines @@
 
   @override
   void visitElement(Element element) {
     int offset = element.nameOffset;
     if (offset != -1) {
       map[offset] = element;
     }
     super.visitElement(element);
   }
 }