Skip to content

Commit ea99b16

Browse files
authored
Elements. Migrate test/typedefs_test.dart (#3964)
* Elements. Migrate test/typedefs_test.dart * Rebuild generated file
1 parent 456dd6e commit ea99b16

File tree

6 files changed

+61
-16
lines changed

6 files changed

+61
-16
lines changed

lib/resources/docs.dart.js

Lines changed: 10 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/resources/docs.dart.js.map

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/src/element_type.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
library;
1111

1212
import 'package:analyzer/dart/element/element.dart';
13+
import 'package:analyzer/dart/element/element2.dart';
1314
import 'package:analyzer/dart/element/nullability_suffix.dart';
1415
import 'package:analyzer/dart/element/type.dart';
1516
import 'package:dartdoc/src/model/comment_referable.dart';
@@ -209,6 +210,8 @@ class ParameterizedElementType extends DefinedElementType with Rendered {
209210
mixin Aliased implements ElementType {
210211
Element get typeAliasElement => type.alias!.element;
211212

213+
Element2 get typeAliasElement2 => type.alias!.element2;
214+
212215
@override
213216
String get name => typeAliasElement.name!;
214217

lib/src/generator/templates.runtime_renderers.dart

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20231,13 +20231,13 @@ class _Renderer_PackageTemplateData extends RendererBase<PackageTemplateData> {
2023120231
}
2023220232
}
2023320233

20234-
String renderIndex(PackageTemplateData context, Template template) {
20234+
String renderSearchPage(PackageTemplateData context, Template template) {
2023520235
var buffer = StringBuffer();
2023620236
_render_PackageTemplateData(context, template.ast, template, buffer);
2023720237
return buffer.toString();
2023820238
}
2023920239

20240-
String renderSearchPage(PackageTemplateData context, Template template) {
20240+
String renderIndex(PackageTemplateData context, Template template) {
2024120241
var buffer = StringBuffer();
2024220242
_render_PackageTemplateData(context, template.ast, template, buffer);
2024320243
return buffer.toString();
@@ -24813,6 +24813,34 @@ class _Renderer_Typedef extends RendererBase<Typedef> {
2481324813
);
2481424814
},
2481524815
),
24816+
'element2': Property(
24817+
getValue: (CT_ c) => c.element2,
24818+
renderVariable:
24819+
(CT_ c, Property<CT_> self, List<String> remainingNames) =>
24820+
self.renderSimpleVariable(
24821+
c,
24822+
remainingNames,
24823+
'TypeAliasElement2',
24824+
),
24825+
24826+
isNullValue: (CT_ c) => false,
24827+
24828+
renderValue: (
24829+
CT_ c,
24830+
RendererBase<CT_> r,
24831+
List<MustachioNode> ast,
24832+
StringSink sink,
24833+
) {
24834+
renderSimple(
24835+
c.element2,
24836+
ast,
24837+
r.template,
24838+
sink,
24839+
parent: r,
24840+
getters: _invisibleGetters['TypeAliasElement2']!,
24841+
);
24842+
},
24843+
),
2481624844
'enclosingElement': Property(
2481724845
getValue: (CT_ c) => c.enclosingElement,
2481824846
renderVariable: (
@@ -26309,6 +26337,15 @@ const _invisibleGetters = {
2630926337
'name',
2631026338
'runtimeType',
2631126339
},
26340+
'TypeAliasElement2': {
26341+
'aliasedElement2',
26342+
'aliasedType',
26343+
'enclosingElement2',
26344+
'firstFragment',
26345+
'hashCode',
26346+
'name',
26347+
'runtimeType',
26348+
},
2631226349
'TypeParameterElement': {
2631326350
'bound',
2631426351
'declaration',

lib/src/model/typedef.dart

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
// ignore_for_file: analyzer_use_new_elements
66

77
import 'package:analyzer/dart/element/element.dart';
8+
import 'package:analyzer/dart/element/element2.dart';
89
import 'package:analyzer/dart/element/type.dart';
10+
// ignore: implementation_imports
11+
import 'package:analyzer/src/utilities/extensions/element.dart';
912
import 'package:dartdoc/src/element_type.dart';
1013
import 'package:dartdoc/src/model/comment_referable.dart';
1114
import 'package:dartdoc/src/model/kind.dart';
@@ -16,6 +19,8 @@ abstract class Typedef extends ModelElement
1619
@override
1720
final TypeAliasElement element;
1821

22+
TypeAliasElement2 get element2 => element.asElement2 as TypeAliasElement2;
23+
1924
Typedef(this.element, super.library, super.packageGraph);
2025

2126
DartType get aliasedType => element.aliasedType;

test/typedefs_test.dart

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
// ignore_for_file: analyzer_use_new_elements
6-
75
import 'package:analyzer/dart/element/type.dart';
86
import 'package:dartdoc/src/element_type.dart';
97
import 'package:test/test.dart';
@@ -256,7 +254,7 @@ R<int> f(int a, String b) {
256254

257255
expect(
258256
fFunc.modelType.returnType,
259-
isA<AliasedUndefinedElementType>().having((e) => e.typeAliasElement,
260-
'typeAliasElement', equals(rTypedef.element)));
257+
isA<AliasedUndefinedElementType>().having((e) => e.typeAliasElement2,
258+
'typeAliasElement', equals(rTypedef.element2)));
261259
}
262260
}

0 commit comments

Comments
 (0)