Migrate element_type to nnbd

lib/src/generator/templates.runtime_renderers.dart

@@ -1883,16 +1883,26 @@ class _Renderer_CommentReferable extends RendererBase<CommentReferable> {
       _propertyMapCache.putIfAbsent(
           CT_,
           () => {
-                'element': Property(
-                  getValue: (CT_ c) => c.element,
-                  renderVariable: (CT_ c, Property<CT_> self,
-                          List<String> remainingNames) =>
-                      self.renderSimpleVariable(c, remainingNames, 'Element'),
-                  isNullValue: (CT_ c) => c.element == null,
+                'definingCommentReferable': Property(
+                  getValue: (CT_ c) => c.definingCommentReferable,
+                  renderVariable:
+                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
+                    if (remainingNames.isEmpty) {
+                      return self.getValue(c).toString();
+                    }
+                    var name = remainingNames.first;
+                    var nextProperty =
+                        _Renderer_CommentReferable.propertyMap().getValue(name);
+                    return nextProperty.renderVariable(self.getValue(c),
+                        nextProperty, [...remainingNames.skip(1)]);
+                  },
+                  isNullValue: (CT_ c) => c.definingCommentReferable == null,
                   renderValue: (CT_ c, RendererBase<CT_> r,
                       List<MustachioNode> ast, StringSink sink) {
-                    renderSimple(c.element, ast, r.template, sink,
-                        parent: r, getters: _invisibleGetters['Element']);
+                    renderSimple(
+                        c.definingCommentReferable, ast, r.template, sink,
+                        parent: r,
+                        getters: _invisibleGetters['CommentReferable']);
                   },
                 ),
                 'href': Property(
@@ -3556,6 +3566,28 @@ class _Renderer_DefinedElementType extends RendererBase<DefinedElementType> {
           CT_,
           () => {
                 ..._Renderer_ElementType.propertyMap<CT_>(),
+                'definingCommentReferable': Property(
+                  getValue: (CT_ c) => c.definingCommentReferable,
+                  renderVariable:
+                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
+                    if (remainingNames.isEmpty) {
+                      return self.getValue(c).toString();
+                    }
+                    var name = remainingNames.first;
+                    var nextProperty =
+                        _Renderer_CommentReferable.propertyMap().getValue(name);
+                    return nextProperty.renderVariable(self.getValue(c),
+                        nextProperty, [...remainingNames.skip(1)]);
+                  },
+                  isNullValue: (CT_ c) => c.definingCommentReferable == null,
+                  renderValue: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    renderSimple(
+                        c.definingCommentReferable, ast, r.template, sink,
+                        parent: r,
+                        getters: _invisibleGetters['CommentReferable']);
+                  },
+                ),
                 'element': Property(
                   getValue: (CT_ c) => c.element,
                   renderVariable: (CT_ c, Property<CT_> self,
@@ -9511,6 +9543,28 @@ class _Renderer_ModelElement extends RendererBase<ModelElement> {
                         getters: _invisibleGetters['DartdocOptionContext']);
                   },
                 ),
+                'definingCommentReferable': Property(
+                  getValue: (CT_ c) => c.definingCommentReferable,
+                  renderVariable:
+                      (CT_ c, Property<CT_> self, List<String> remainingNames) {
+                    if (remainingNames.isEmpty) {
+                      return self.getValue(c).toString();
+                    }
+                    var name = remainingNames.first;
+                    var nextProperty =
+                        _Renderer_CommentReferable.propertyMap().getValue(name);
+                    return nextProperty.renderVariable(self.getValue(c),
+                        nextProperty, [...remainingNames.skip(1)]);
+                  },
+                  isNullValue: (CT_ c) => c.definingCommentReferable == null,
+                  renderValue: (CT_ c, RendererBase<CT_> r,
+                      List<MustachioNode> ast, StringSink sink) {
+                    renderSimple(
+                        c.definingCommentReferable, ast, r.template, sink,
+                        parent: r,
+                        getters: _invisibleGetters['CommentReferable']);
+                  },
+                ),
                 'definingLibrary': Property(
                   getValue: (CT_ c) => c.definingLibrary,
                   renderVariable:
@@ -15177,7 +15231,7 @@ const _invisibleGetters = {
     'referenceGrandparentOverrides',
     'referenceName',
     'library',
-    'element'
+    'definingCommentReferable'
   },
   'CompilationUnitElement': {
     'hashCode',
@@ -15672,7 +15726,6 @@ const _invisibleGetters = {
     'sdk',
     'allLibrariesAdded',
     'name',
-    'element',
     'implementors',
     'documentedExtensions',
     'extensions',

lib/src/model/comment_referable.dart

@@ -225,6 +225,9 @@ mixin CommentReferable implements Nameable, ModelBuilderInterface {
   // TODO(jcollins-g): Eliminate need for this in markdown_processor.
   Library? get library => null;
 
-  // TODO(jcollins-g): Eliminate need for this in markdown_processor.
-  Element? get element;
+  @internal
+
+  /// For testing / comparison only, get the comment referable from where this
+  /// [ElementType] was defined.  Override where an [Element] is available.
+  CommentReferable get definingCommentReferable => this;
 }

lib/src/model/model_element.dart

@@ -996,4 +996,10 @@ abstract class ModelElement extends Canonicalization
 
     return modelElementRenderer.renderLinkedName(this);
   }
+
+  @internal
+  @override
+  CommentReferable get definingCommentReferable => element == null
+      ? super.definingCommentReferable
+      : modelBuilder.fromElement(element);
 }

lib/src/model/package_graph.dart

@@ -54,9 +54,6 @@ class PackageGraph with CommentReferable, Nameable, ModelBuilder {
   @override
   String get name => null;
 
-  @override
-  Element get element => null;
-
   /// Call during initialization to add a library to this [PackageGraph].
   ///
   /// Libraries added in this manner are assumed to be part of documented

lib/src/render/element_type_renderer.dart

@@ -182,14 +182,12 @@ class CallableElementTypeRendererHtml
   String renderNameWithGenerics(CallableElementType elementType) {
     var buf = StringBuffer();
     buf.write(elementType.name);
-    if (elementType.typeArguments != null) {
-      if (elementType.typeArguments.isNotEmpty &&
-          !elementType.typeArguments.every((t) => t.name == 'dynamic')) {
-        buf.write('<');
-        buf.writeAll(
-            elementType.typeArguments.map((t) => t.nameWithGenerics), ', ');
-        buf.write('>');
-      }
+    if (elementType.typeArguments.isNotEmpty &&
+        !elementType.typeArguments.every((t) => t.name == 'dynamic')) {
+      buf.write('<');
+      buf.writeAll(
+          elementType.typeArguments.map((t) => t.nameWithGenerics), ', ');
+      buf.write('>');
     }
     return wrapNullability(elementType, buf.toString());
   }
@@ -345,14 +343,12 @@ class CallableElementTypeRendererMd
   String renderNameWithGenerics(CallableElementType elementType) {
     var buf = StringBuffer();
     buf.write(elementType.name);
-    if (elementType.typeArguments != null) {
-      if (elementType.typeArguments.isNotEmpty &&
-          !elementType.typeArguments.every((t) => t.name == 'dynamic')) {
-        buf.write('<');
-        buf.writeAll(
-            elementType.typeArguments.map((t) => t.nameWithGenerics), ', ');
-        buf.write('>');
-      }
+    if (elementType.typeArguments.isNotEmpty &&
+        !elementType.typeArguments.every((t) => t.name == 'dynamic')) {
+      buf.write('<');
+      buf.writeAll(
+          elementType.typeArguments.map((t) => t.nameWithGenerics), ', ');
+      buf.write('>');
     }
     return wrapNullability(elementType, buf.toString());
   }

lib/src/warnings.dart

@@ -282,7 +282,6 @@ const Map<PackageWarning, PackageWarningDefinition> packageWarningDefinitions =
 /// Something that package warnings can be called on.  Optionally associated
 /// with an analyzer [element].
 mixin Warnable implements Canonicalization, CommentReferable {
-  @override
   Element? get element;
 
   Warnable? get enclosingElement;

test/comment_referable/comment_referable_test.dart

@@ -6,7 +6,6 @@
 
 library dartdoc.comment_reference_test;
 
-import 'package:analyzer/dart/element/element.dart';
 import 'package:dartdoc/src/model/comment_referable.dart';
 import 'package:dartdoc/src/model/model_object_builder.dart';
 import 'package:dartdoc/src/model/nameable.dart';
@@ -34,9 +33,6 @@ abstract class Base extends Nameable with CommentReferable {
       referenceBy(value.split(_separator),
           allowTree: allowTree ?? (_) => true, filter: filter ?? (_) => true);
 
-  @override
-  Element get element => throw UnimplementedError();
-
   @override
   Iterable<CommentReferable> get referenceGrandparentOverrides => null;
 }

test/src/utils.dart

@@ -204,11 +204,12 @@ two:lib/
 /// as the original lookup code returns canonicalized results and the
 /// new lookup code is only guaranteed to return equivalent results.
 MatchingLinkResult definingLinkResult(MatchingLinkResult originalResult) {
-  if (originalResult.commentReferable?.element != null) {
-    return MatchingLinkResult(
-        originalResult.commentReferable.modelBuilder
-            .fromElement(originalResult.commentReferable.element),
-        warn: originalResult.warn);
+  var definingReferable =
+      originalResult.commentReferable?.definingCommentReferable;
+
+  if (definingReferable != null &&
+      definingReferable != originalResult.commentReferable) {
+    return MatchingLinkResult(definingReferable, warn: originalResult.warn);
   }
   return originalResult;
 }