Fix for resynthesizing default values referencing type parameters.

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 413 matching lines @@
     return true;
   }
 
   @override
   ElementKind get kind => ElementKind.CLASS;
 
   @override
   List<ElementAnnotation> get metadata {
     if (_unlinkedClass != null) {
       return _metadata ??= _unlinkedClass.annotations
-          .map(enclosingUnit.resynthesizerContext.buildAnnotation)
+          .map((a) =>
+              enclosingUnit.resynthesizerContext.buildAnnotation(this, a))
           .toList();
     }
     return super.metadata;
   }
 
   @override
   List<MethodElement> get methods => _methods;
 
   /**
    * Set the methods contained in this class to the given [methods].
@@ skipping 820 matching lines @@
   String get identifier => source.encoding;
   @override
   ElementKind get kind => ElementKind.COMPILATION_UNIT;
 
   @override
   List<ElementAnnotation> get metadata {
     if (_unlinkedPart != null) {
       CompilationUnitElementImpl definingUnit =
           library.definingCompilationUnit as CompilationUnitElementImpl;
       return _metadata ??= _unlinkedPart.annotations
-          .map(definingUnit.resynthesizerContext.buildAnnotation)
+          .map(
+              (a) => definingUnit.resynthesizerContext.buildAnnotation(this, a))
           .toList();
     }
     return super.metadata;
   }
 
   @override
   List<TopLevelVariableElement> get topLevelVariables {
     if (_unlinkedUnit != null) {
       if (_variables == null) {
         _explicitTopLevelAccessors ??=
@@ skipping 513 matching lines @@
       UnlinkedParam unlinkedParam, ElementImpl enclosingElement)
       : super.forSerialized(unlinkedParam, enclosingElement);
 
   @override
   Expression get constantInitializer {
     if (_unlinkedParam != null) {
       UnlinkedConst defaultValue = _unlinkedParam.defaultValue;
       if (defaultValue == null) {
         return null;
       }
-      return super.constantInitializer ??=
-          enclosingUnit.resynthesizerContext.buildExpression(defaultValue);
+      return super.constantInitializer ??= enclosingUnit.resynthesizerContext
+          .buildExpression(this, defaultValue);
     }
     return super.constantInitializer;
   }
 
   @override
   void set constantInitializer(Expression initializer) {
     assert(_unlinkedParam == null);
     super.constantInitializer = initializer;
   }
 
@@ skipping 1097 matching lines @@
     for (LocalVariableElement variable in variables) {
       (variable as LocalVariableElementImpl).enclosingElement = this;
     }
     this._localVariables = variables;
   }
 
   @override
   List<ElementAnnotation> get metadata {
     if (serializedExecutable != null) {
       return _metadata ??= serializedExecutable.annotations
-          .map(enclosingUnit.resynthesizerContext.buildAnnotation)
+          .map((a) =>
+              enclosingUnit.resynthesizerContext.buildAnnotation(this, a))
           .toList();
     }
     return super.metadata;
   }
 
   @override
   String get name {
     if (serializedExecutable != null) {
       return serializedExecutable.name;
     }
@@ skipping 487 matching lines @@
   CompilationUnitElementImpl get enclosingUnit =>
       _enclosingElement as CompilationUnitElementImpl;
 
   @override
   ElementKind get kind => ElementKind.FUNCTION_TYPE_ALIAS;
 
   @override
   List<ElementAnnotation> get metadata {
     if (_unlinkedTypedef != null) {
       return _metadata ??= _unlinkedTypedef.annotations
-          .map(enclosingUnit.resynthesizerContext.buildAnnotation)
+          .map((a) =>
+              enclosingUnit.resynthesizerContext.buildAnnotation(this, a))
           .toList();
     }
     return super.metadata;
   }
 
   @override
   String get name {
     if (_unlinkedTypedef != null) {
       return _unlinkedTypedef.name;
     }
@@ skipping 657 matching lines @@
     return _loadLibraryFunction;
   }
 
   @override
   List<ElementAnnotation> get metadata {
     if (_unlinkedDefiningUnit != null) {
       if (_metadata == null) {
         CompilationUnitElementImpl definingUnit =
             _definingCompilationUnit as CompilationUnitElementImpl;
         _metadata ??= _unlinkedDefiningUnit.libraryAnnotations
-            .map(definingUnit.resynthesizerContext.buildAnnotation)
+            .map((a) =>
+                definingUnit.resynthesizerContext.buildAnnotation(this, a))
             .toList();
       }
       return _metadata;
     }
     return super.metadata;
   }
 
   @override
   List<CompilationUnitElement> get parts => _parts;
 
@@ skipping 968 matching lines @@
     if (_unlinkedVariable != null) {
       return _unlinkedVariable.isFinal;
     }
     return super.isFinal;
   }
 
   @override
   List<ElementAnnotation> get metadata {
     if (_unlinkedVariable != null) {
       return _metadata ??= _unlinkedVariable.annotations
-          .map(enclosingUnit.resynthesizerContext.buildAnnotation)
+          .map((a) =>
+              enclosingUnit.resynthesizerContext.buildAnnotation(this, a))
           .toList();
     }
     return super.metadata;
   }
 
   @override
   String get name {
     if (_unlinkedVariable != null) {
       return _unlinkedVariable.name;
     }
@@ skipping 178 matching lines @@
   @override
   ElementKind get kind => ElementKind.PARAMETER;
 
   @override
   List<ElementAnnotation> get metadata {
     if (_unlinkedParam != null) {
       if (_unlinkedParam.annotations.isEmpty) {
         return const <ElementAnnotation>[];
       }
       return _metadata ??= _unlinkedParam.annotations
-          .map(enclosingUnit.resynthesizerContext.buildAnnotation)
+          .map((a) =>
+              enclosingUnit.resynthesizerContext.buildAnnotation(this, a))
           .toList();
     }
     return super.metadata;
   }
 
   @override
   String get name {
     if (_unlinkedParam != null) {
       return _unlinkedParam.name;
     }
@@ skipping 391 matching lines @@
       : super.forSerialized(unlinkedVariable, enclosingElement);
 }
 
 /**
  * The context in which elements are resynthesized.
  */
 abstract class ResynthesizerContext {
   /**
    * Build [ElementAnnotationImpl] for the given [UnlinkedConst].
    */
-  ElementAnnotationImpl buildAnnotation(UnlinkedConst uc);
+  ElementAnnotationImpl buildAnnotation(Element context, UnlinkedConst uc);
 
   /**
    * Build [Expression] for the given [UnlinkedConst].
    */
-  Expression buildExpression(UnlinkedConst uc);
+  Expression buildExpression(Element context, UnlinkedConst uc);
 
   /**
    * Build explicit top-level property accessors.
    */
   UnitExplicitTopLevelAccessors buildTopLevelAccessors();
 
   /**
    * Build explicit top-level variables.
    */
   UnitExplicitTopLevelVariables buildTopLevelVariables();
@@ skipping 203 matching lines @@
     return super.enclosingElement;
   }
 
   @override
   ElementKind get kind => ElementKind.TYPE_PARAMETER;
 
   @override
   List<ElementAnnotation> get metadata {
     if (_unlinkedTypeParam != null) {
       return _metadata ??= _unlinkedTypeParam.annotations
-          .map(enclosingUnit.resynthesizerContext.buildAnnotation)
+          .map((a) =>
+              enclosingUnit.resynthesizerContext.buildAnnotation(this, a))
           .toList();
     }
     return super.metadata;
   }
 
   @override
   String get name {
     if (_unlinkedTypeParam != null) {
       return _unlinkedTypeParam.name;
     }
@@ skipping 334 matching lines @@
 
   @override
   void visitElement(Element element) {
     int offset = element.nameOffset;
     if (offset != -1) {
       map[offset] = element;
     }
     super.visitElement(element);
   }
 }