Convert to instantiateToBounds2 and eliminate deprecated analyzer API usage (#2192)

* cleanup

* Cleanups and type fixing

* dartfmt

Author: jcollins-g

lib/src/element_type.dart

@@ -11,7 +11,6 @@ import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/nullability_suffix.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/dart/element/element.dart' show ClassElementImpl;
-import 'package:analyzer/src/generated/type_system.dart';
 import 'package:dartdoc/src/model/model.dart';
 import 'package:dartdoc/src/render/element_type_renderer.dart';
 
@@ -143,16 +142,19 @@ class FunctionTypeElementType extends UndefinedElementType {
       PackageGraph packageGraph, ElementType returnedFrom)
       : super(f, library, packageGraph, returnedFrom);
 
+  @override
+  FunctionType get type => super.type;
+
   @override
   List<Parameter> get parameters {
-    List<ParameterElement> params = (type as FunctionType).parameters;
+    List<ParameterElement> params = type.parameters;
     return UnmodifiableListView<Parameter>(params
         .map((p) => ModelElement.from(p, library, packageGraph) as Parameter)
         .toList());
   }
 
-  ElementType get returnType => ElementType.from(
-      (type as FunctionType).returnType, library, packageGraph, this);
+  ElementType get returnType =>
+      ElementType.from(type.returnType, library, packageGraph, this);
 
   @override
   String get linkedName {
@@ -176,7 +178,7 @@ class FunctionTypeElementType extends UndefinedElementType {
   }
 
   List<TypeParameter> get typeFormals {
-    List<TypeParameterElement> typeFormals = (type as FunctionType).typeFormals;
+    List<TypeParameterElement> typeFormals = type.typeFormals;
     return UnmodifiableListView<TypeParameter>(typeFormals
         .map(
             (p) => ModelElement.from(p, library, packageGraph) as TypeParameter)
@@ -223,16 +225,16 @@ class TypeParameterElementType extends DefinedElementType {
       : super(type, library, packageGraph, element, returnedFrom);
 
   @override
-  String get linkedName => name;
+  TypeParameterType get type => super.type;
 
   @override
-  String get nameWithGenerics => name;
+  String get linkedName => name;
 
   @override
-  ClassElement get _boundClassElement => type.element;
+  String get nameWithGenerics => name;
 
   @override
-  DartType get _bound => (type as TypeParameterType).bound;
+  DartType get _bound => type.bound;
 }
 
 /// An [ElementType] associated with an [Element].
@@ -294,11 +296,6 @@ abstract class DefinedElementType extends ElementType {
     return _typeArguments;
   }
 
-  /// By default, the bound is the type of the declared class.
-  ClassElement get _boundClassElement => (element.element as ClassElement);
-  Class get boundClass =>
-      ModelElement.fromElement(_boundClassElement, packageGraph);
-
   DartType get _bound => type;
 
   DartType _instantiatedType;
@@ -311,10 +308,10 @@ abstract class DefinedElementType extends ElementType {
           !(_bound as InterfaceType)
               .typeArguments
               .every((t) => t is InterfaceType)) {
-        var typeSystem = library.element.typeSystem as TypeSystemImpl;
-        // TODO(jcollins-g): convert to ClassElement.instantiateToBounds
-        // dart-lang/dartdoc#2135
-        _instantiatedType = typeSystem.instantiateToBounds(_bound);
+        var typeSystem = library.element.typeSystem;
+        _instantiatedType = typeSystem.instantiateToBounds2(
+            classElement: _bound.element as ClassElement,
+            nullabilitySuffix: _bound.nullabilitySuffix);
       } else {
         _instantiatedType = _bound;
       }

lib/src/model/class.dart

@@ -24,19 +24,20 @@ class Class extends Container
   Class(ClassElement element, Library library, PackageGraph packageGraph)
       : super(element, library, packageGraph) {
     packageGraph.specialClasses.addSpecial(this);
-    mixins = _cls.mixins
+    mixins = element.mixins
         .map((f) {
           DefinedElementType t = ElementType.from(f, library, packageGraph);
           return t;
         })
         .where((mixin) => mixin != null)
         .toList(growable: false);
 
-    if (_cls.supertype != null && _cls.supertype.element.supertype != null) {
-      supertype = ElementType.from(_cls.supertype, library, packageGraph);
+    if (element.supertype != null &&
+        element.supertype.element.supertype != null) {
+      supertype = ElementType.from(element.supertype, library, packageGraph);
     }
 
-    _interfaces = _cls.interfaces
+    _interfaces = element.interfaces
         .map((f) =>
             ElementType.from(f, library, packageGraph) as DefinedElementType)
         .toList(growable: false);
@@ -168,7 +169,7 @@ class Class extends Container
   List<Constructor> get constructors {
     if (_constructors != null) return _constructors;
 
-    _constructors = _cls.constructors.map((e) {
+    _constructors = element.constructors.map((e) {
       return ModelElement.from(e, library, packageGraph) as Constructor;
     }).toList(growable: true)
       ..sort(byName);
@@ -183,6 +184,9 @@ class Class extends Container
   @override
   ModelElement get enclosingElement => library;
 
+  @override
+  ClassElement get element => super.element;
+
   @override
   String get fileName => '$name-class.$fileType';
 
@@ -319,7 +323,7 @@ class Class extends Container
   Iterable<DefinedElementType> get publicInterfaces =>
       model_utils.filterNonPublic(interfaces);
 
-  bool get isAbstract => _cls.isAbstract;
+  bool get isAbstract => element.isAbstract;
 
   @override
   bool get isCanonical => super.isCanonical && isPublic;
@@ -331,9 +335,9 @@ class Class extends Container
     }
 
     // if this class is itself Error or Exception, return true
-    if (_doCheck(_cls)) return true;
+    if (_doCheck(element)) return true;
 
-    return _cls.allSupertypes.map((t) => t.element).any(_doCheck);
+    return element.allSupertypes.map((t) => t.element).any(_doCheck);
   }
 
   /// Returns true if [other] is a parent class for this class.
@@ -410,13 +414,12 @@ class Class extends Container
 
   List<ExecutableElement> get _inheritedElements {
     if (__inheritedElements == null) {
-      var classElement = element as ClassElement;
-      if (classElement.isDartCoreObject) {
+      if (element.isDartCoreObject) {
         return __inheritedElements = <ExecutableElement>[];
       }
 
       var inheritance = definingLibrary.inheritanceManager;
-      var classType = classElement.thisType;
+      var classType = element.thisType;
       var cmap = inheritance.getInheritedConcreteMap(classType);
       var imap = inheritance.getInheritedMap(classType);
 
@@ -454,7 +457,7 @@ class Class extends Container
       // For half-inherited fields, the analyzer only links the non-inherited
       // to the [FieldElement].  Compose our [Field] class by hand by looking up
       // inherited accessors that may be related.
-      for (FieldElement f in _cls.fields) {
+      for (FieldElement f in element.fields) {
         PropertyAccessorElement getterElement = f.getter;
         if (getterElement == null && accessorMap.containsKey(f.name)) {
           getterElement = accessorMap[f.name]
@@ -543,14 +546,12 @@ class Class extends Container
     _fields.add(field);
   }
 
-  ClassElement get _cls => (element as ClassElement);
-
   List<Method> _methods;
 
   @override
   List<Method> get methods {
     if (_methods == null) {
-      _methods = _cls.methods.map((e) {
+      _methods = element.methods.map((e) {
         return ModelElement.from(e, library, packageGraph) as Method;
       }).toList(growable: false)
         ..sort(byName);
@@ -564,7 +565,7 @@ class Class extends Container
   @override
   List<TypeParameter> get typeParameters {
     if (_typeParameters == null) {
-      _typeParameters = _cls.typeParameters.map((f) {
+      _typeParameters = element.typeParameters.map((f) {
         var lib = Library(f.enclosingElement.library, packageGraph);
         return ModelElement.from(f, lib, packageGraph) as TypeParameter;
       }).toList();

lib/src/model/mixin.dart

@@ -45,8 +45,7 @@ class Mixin extends Class {
   /// Returns a list of superclass constraints for this mixin.
   Iterable<ParameterizedElementType> get superclassConstraints {
     if (_superclassConstraints == null) {
-      _superclassConstraints = (element as ClassElement)
-          .superclassConstraints
+      _superclassConstraints = element.superclassConstraints
           .map<ParameterizedElementType>(
               (InterfaceType i) => ElementType.from(i, library, packageGraph))
           .toList();

lib/src/model/model_element.dart

@@ -838,7 +838,7 @@ abstract class ModelElement extends Canonicalization
   }
 
   CompilationUnitElement get compilationUnitElement =>
-      element.getAncestor((e) => e is CompilationUnitElement);
+      element.thisOrAncestorOfType<CompilationUnitElement>();
 
   bool get hasAnnotations => annotations.isNotEmpty;
 

lib/src/model/package_builder.dart

@@ -5,6 +5,7 @@
 import 'dart:async';
 import 'dart:io';
 
+import 'package:analyzer/dart/analysis/features.dart';
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/file_system/file_system.dart' as file_system;
@@ -157,7 +158,8 @@ class PackageBuilder {
       AnalysisOptionsImpl options = AnalysisOptionsImpl();
 
       // TODO(jcollins-g): pass in an ExperimentStatus instead?
-      options.enabledExperiments = config.enableExperiment;
+      options.contextFeatures =
+          FeatureSet.fromEnableFlags(config.enableExperiment);
 
       // TODO(jcollins-g): Make use of currently not existing API for managing
       //                   many AnalysisDrivers