Elements. Migrate test/typedefs_test.dart (#3964)

* Elements. Migrate test/typedefs_test.dart * Rebuild generated file
dart-lang · Jan 16, 2025 · ea99b16 · ea99b16
1 parent 456dd6e
commit ea99b16
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 16 deletions.
diff --git a/lib/resources/docs.dart.js b/lib/resources/docs.dart.js
diff --git a/lib/resources/docs.dart.js.map b/lib/resources/docs.dart.js.map
diff --git a/lib/src/element_type.dart b/lib/src/element_type.dart
@@ -10,6 +10,7 @@
 library;
 
 import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/nullability_suffix.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:dartdoc/src/model/comment_referable.dart';
@@ -209,6 +210,8 @@ class ParameterizedElementType extends DefinedElementType with Rendered {
 mixin Aliased implements ElementType {
   Element get typeAliasElement => type.alias!.element;
 
+  Element2 get typeAliasElement2 => type.alias!.element2;
+
   @override
   String get name => typeAliasElement.name!;
 

diff --git a/lib/src/generator/templates.runtime_renderers.dart b/lib/src/generator/templates.runtime_renderers.dart
@@ -20231,13 +20231,13 @@ class _Renderer_PackageTemplateData extends RendererBase<PackageTemplateData> {
   }
 }
 
-String renderIndex(PackageTemplateData context, Template template) {
+String renderSearchPage(PackageTemplateData context, Template template) {
   var buffer = StringBuffer();
   _render_PackageTemplateData(context, template.ast, template, buffer);
   return buffer.toString();
 }
 
-String renderSearchPage(PackageTemplateData context, Template template) {
+String renderIndex(PackageTemplateData context, Template template) {
   var buffer = StringBuffer();
   _render_PackageTemplateData(context, template.ast, template, buffer);
   return buffer.toString();
@@ -24813,6 +24813,34 @@ class _Renderer_Typedef extends RendererBase<Typedef> {
                   );
                 },
               ),
+              'element2': Property(
+                getValue: (CT_ c) => c.element2,
+                renderVariable:
+                    (CT_ c, Property<CT_> self, List<String> remainingNames) =>
+                        self.renderSimpleVariable(
+                          c,
+                          remainingNames,
+                          'TypeAliasElement2',
+                        ),
+
+                isNullValue: (CT_ c) => false,
+
+                renderValue: (
+                  CT_ c,
+                  RendererBase<CT_> r,
+                  List<MustachioNode> ast,
+                  StringSink sink,
+                ) {
+                  renderSimple(
+                    c.element2,
+                    ast,
+                    r.template,
+                    sink,
+                    parent: r,
+                    getters: _invisibleGetters['TypeAliasElement2']!,
+                  );
+                },
+              ),
               'enclosingElement': Property(
                 getValue: (CT_ c) => c.enclosingElement,
                 renderVariable: (
@@ -26309,6 +26337,15 @@ const _invisibleGetters = {
     'name',
     'runtimeType',
   },
+  'TypeAliasElement2': {
+    'aliasedElement2',
+    'aliasedType',
+    'enclosingElement2',
+    'firstFragment',
+    'hashCode',
+    'name',
+    'runtimeType',
+  },
   'TypeParameterElement': {
     'bound',
     'declaration',

diff --git a/lib/src/model/typedef.dart b/lib/src/model/typedef.dart
@@ -5,7 +5,10 @@
 // ignore_for_file: analyzer_use_new_elements
 
 import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/type.dart';
+// ignore: implementation_imports
+import 'package:analyzer/src/utilities/extensions/element.dart';
 import 'package:dartdoc/src/element_type.dart';
 import 'package:dartdoc/src/model/comment_referable.dart';
 import 'package:dartdoc/src/model/kind.dart';
@@ -16,6 +19,8 @@ abstract class Typedef extends ModelElement
   @override
   final TypeAliasElement element;
 
+  TypeAliasElement2 get element2 => element.asElement2 as TypeAliasElement2;
+
   Typedef(this.element, super.library, super.packageGraph);
 
   DartType get aliasedType => element.aliasedType;

diff --git a/test/typedefs_test.dart b/test/typedefs_test.dart
@@ -2,8 +2,6 @@
 // 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.
 
-// ignore_for_file: analyzer_use_new_elements
-
 import 'package:analyzer/dart/element/type.dart';
 import 'package:dartdoc/src/element_type.dart';
 import 'package:test/test.dart';
@@ -256,7 +254,7 @@ R<int> f(int a, String b) {
 
     expect(
         fFunc.modelType.returnType,
-        isA<AliasedUndefinedElementType>().having((e) => e.typeAliasElement,
-            'typeAliasElement', equals(rTypedef.element)));
+        isA<AliasedUndefinedElementType>().having((e) => e.typeAliasElement2,
+            'typeAliasElement', equals(rTypedef.element2)));
   }
 }