Skip to content

Commit 1694f6b

Browse files
srawlinssrawlins
committed
Merge branch 'main' into migrate-contsructor
2 parents 39d0d20 + a1e234e commit 1694f6b

File tree

12 files changed

+281
-292
lines changed

12 files changed

+281
-292
lines changed

‎lib/src/element_type.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ mixin Aliased implements ElementType {
214214
bool get isTypedef => true;
215215

216216
late final ModelElement aliasElement =
217-
ModelElement.forElement2(typeAliasElement2, packageGraph);
217+
ModelElement.forElement(typeAliasElement2, packageGraph);
218218

219219
late final List<ElementType> aliasArguments = type.alias!.typeArguments
220220
.map((f) => getTypeFor(f, library))
@@ -322,7 +322,7 @@ abstract class DefinedElementType extends ElementType {
322322
@internal
323323
@override
324324
CommentReferable get definingCommentReferable =>
325-
ModelElement.forElement2(modelElement.element2, packageGraph);
325+
ModelElement.forElement(modelElement.element2, packageGraph);
326326
}
327327

328328
/// Any callable [ElementType] will mix-in this class, whether anonymous or not,

‎lib/src/generator/templates.runtime_renderers.dart‎

Lines changed: 85 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -13405,34 +13405,6 @@ class _Renderer_Library extends RendererBase<Library> {
1340513405
);
1340613406
},
1340713407
),
13408-
'compilationUnitElement': Property(
13409-
getValue: (CT_ c) => c.compilationUnitElement,
13410-
renderVariable:
13411-
(CT_ c, Property<CT_> self, List<String> remainingNames) =>
13412-
self.renderSimpleVariable(
13413-
c,
13414-
remainingNames,
13415-
'CompilationUnitElement',
13416-
),
13417-
13418-
isNullValue: (CT_ c) => false,
13419-
13420-
renderValue: (
13421-
CT_ c,
13422-
RendererBase<CT_> r,
13423-
List<MustachioNode> ast,
13424-
StringSink sink,
13425-
) {
13426-
renderSimple(
13427-
c.compilationUnitElement,
13428-
ast,
13429-
r.template,
13430-
sink,
13431-
parent: r,
13432-
getters: _invisibleGetters['CompilationUnitElement']!,
13433-
);
13434-
},
13435-
),
1343613408
'constants': Property(
1343713409
getValue: (CT_ c) => c.constants,
1343813410
renderVariable:
@@ -14272,6 +14244,34 @@ class _Renderer_Library extends RendererBase<Library> {
1427214244
);
1427314245
},
1427414246
),
14247+
'unitElement': Property(
14248+
getValue: (CT_ c) => c.unitElement,
14249+
renderVariable:
14250+
(CT_ c, Property<CT_> self, List<String> remainingNames) =>
14251+
self.renderSimpleVariable(
14252+
c,
14253+
remainingNames,
14254+
'LibraryFragment',
14255+
),
14256+
14257+
isNullValue: (CT_ c) => false,
14258+
14259+
renderValue: (
14260+
CT_ c,
14261+
RendererBase<CT_> r,
14262+
List<MustachioNode> ast,
14263+
StringSink sink,
14264+
) {
14265+
renderSimple(
14266+
c.unitElement,
14267+
ast,
14268+
r.template,
14269+
sink,
14270+
parent: r,
14271+
getters: _invisibleGetters['LibraryFragment']!,
14272+
);
14273+
},
14274+
),
1427514275
},
1427614276
)
1427714277
as Map<String, Property<CT_>>;
@@ -16916,34 +16916,6 @@ class _Renderer_ModelElement extends RendererBase<ModelElement> {
1691616916
);
1691716917
},
1691816918
),
16919-
'compilationUnitElement': Property(
16920-
getValue: (CT_ c) => c.compilationUnitElement,
16921-
renderVariable:
16922-
(CT_ c, Property<CT_> self, List<String> remainingNames) =>
16923-
self.renderSimpleVariable(
16924-
c,
16925-
remainingNames,
16926-
'CompilationUnitElement',
16927-
),
16928-
16929-
isNullValue: (CT_ c) => false,
16930-
16931-
renderValue: (
16932-
CT_ c,
16933-
RendererBase<CT_> r,
16934-
List<MustachioNode> ast,
16935-
StringSink sink,
16936-
) {
16937-
renderSimple(
16938-
c.compilationUnitElement,
16939-
ast,
16940-
r.template,
16941-
sink,
16942-
parent: r,
16943-
getters: _invisibleGetters['CompilationUnitElement']!,
16944-
);
16945-
},
16946-
),
1694716919
'config': Property(
1694816920
getValue: (CT_ c) => c.config,
1694916921
renderVariable:
@@ -18073,6 +18045,34 @@ class _Renderer_ModelElement extends RendererBase<ModelElement> {
1807318045
);
1807418046
},
1807518047
),
18048+
'unitElement': Property(
18049+
getValue: (CT_ c) => c.unitElement,
18050+
renderVariable:
18051+
(CT_ c, Property<CT_> self, List<String> remainingNames) =>
18052+
self.renderSimpleVariable(
18053+
c,
18054+
remainingNames,
18055+
'LibraryFragment',
18056+
),
18057+
18058+
isNullValue: (CT_ c) => false,
18059+
18060+
renderValue: (
18061+
CT_ c,
18062+
RendererBase<CT_> r,
18063+
List<MustachioNode> ast,
18064+
StringSink sink,
18065+
) {
18066+
renderSimple(
18067+
c.unitElement,
18068+
ast,
18069+
r.template,
18070+
sink,
18071+
parent: r,
18072+
getters: _invisibleGetters['LibraryFragment']!,
18073+
);
18074+
},
18075+
),
1807618076
},
1807718077
)
1807818078
as Map<String, Property<CT_>>;
@@ -20413,7 +20413,7 @@ class _Renderer_Package extends RendererBase<Package> {
2041320413
}
2041420414
}
2041520415

20416-
String renderError(PackageTemplateData context, Template template) {
20416+
String renderIndex(PackageTemplateData context, Template template) {
2041720417
var buffer = StringBuffer();
2041820418
_render_PackageTemplateData(context, template.ast, template, buffer);
2041920419
return buffer.toString();
@@ -20770,7 +20770,7 @@ class _Renderer_PackageTemplateData extends RendererBase<PackageTemplateData> {
2077020770
}
2077120771
}
2077220772

20773-
String renderIndex(PackageTemplateData context, Template template) {
20773+
String renderError(PackageTemplateData context, Template template) {
2077420774
var buffer = StringBuffer();
2077520775
_render_PackageTemplateData(context, template.ast, template, buffer);
2077620776
return buffer.toString();
@@ -26256,28 +26256,6 @@ const _invisibleGetters = {
2625626256
'referenceParents',
2625726257
'scope',
2625826258
},
26259-
'CompilationUnitElement': {
26260-
'accessibleExtensions',
26261-
'accessors',
26262-
'classes',
26263-
'enclosingElement3',
26264-
'enums',
26265-
'extensionTypes',
26266-
'extensions',
26267-
'functions',
26268-
'hashCode',
26269-
'libraryExports',
26270-
'libraryImportPrefixes',
26271-
'libraryImports',
26272-
'lineInfo',
26273-
'mixins',
26274-
'parts',
26275-
'runtimeType',
26276-
'scope',
26277-
'session',
26278-
'topLevelVariables',
26279-
'typeAliases',
26280-
},
2628126259
'Constructable': {
2628226260
'constructors',
2628326261
'extraReferenceChildren',
@@ -26837,6 +26815,33 @@ const _invisibleGetters = {
2683726815
'typeSystem',
2683826816
'uri',
2683926817
},
26818+
'LibraryFragment': {
26819+
'accessibleExtensions2',
26820+
'classes2',
26821+
'element',
26822+
'enclosingFragment',
26823+
'enums2',
26824+
'extensionTypes2',
26825+
'extensions2',
26826+
'functions2',
26827+
'getters',
26828+
'hashCode',
26829+
'importedLibraries2',
26830+
'libraryExports2',
26831+
'libraryImports2',
26832+
'lineInfo',
26833+
'mixins2',
26834+
'nextFragment',
26835+
'partIncludes',
26836+
'prefixes',
26837+
'previousFragment',
26838+
'runtimeType',
26839+
'scope',
26840+
'setters',
26841+
'source',
26842+
'topLevelVariables2',
26843+
'typeAliases2',
26844+
},
2684026845
'List': {'hashCode', 'length', 'reversed', 'runtimeType'},
2684126846
'Locatable': {
2684226847
'documentationFrom',

‎lib/src/model/accessor.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class Accessor extends ModelElement {
6161
if (!isSynthetic) {
6262
return super.sourceCode;
6363
}
64-
var modelNode = packageGraph.getModelNodeFor2(definingCombo.element2);
64+
var modelNode = packageGraph.getModelNodeFor(definingCombo.element2);
6565
return modelNode == null
6666
? ''
6767
: const HtmlEscape().convert(modelNode.sourceCode);

‎lib/src/model/canonicalization.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Library? canonicalLibraryCandidate(ModelElement modelElement) {
5858
}
5959

6060
var topLevelModelElement =
61-
ModelElement.forElement2(topLevelElement, modelElement.packageGraph);
61+
ModelElement.forElement(topLevelElement, modelElement.packageGraph);
6262

6363
return _Canonicalization(topLevelModelElement)
6464
.canonicalLibraryCandidate(candidateLibraries);

‎lib/src/model/constructor.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
import 'package:analyzer/dart/element/element.dart';
66
import 'package:analyzer/dart/element/element2.dart';
77
import 'package:analyzer/source/line_info.dart';
8+
// ignore: implementation_imports
9+
import 'package:analyzer/src/utilities/extensions/element.dart';
810
import 'package:dartdoc/src/element_type.dart';
911
import 'package:dartdoc/src/model/comment_referable.dart';
1012
import 'package:dartdoc/src/model/kind.dart';
@@ -14,9 +16,7 @@ import 'package:dartdoc/src/model_utils.dart';
1416
class Constructor extends ModelElement with ContainerMember, TypeParameters {
1517
@override
1618
// ignore: analyzer_use_new_elements
17-
ConstructorElement get element =>
18-
// ignore: analyzer_use_new_elements
19-
element2.firstFragment as ConstructorElement;
19+
ConstructorElement get element => element2.asElement;
2020

2121
@override
2222
final ConstructorElement2 element2;

‎lib/src/model/extension.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,12 @@ class Extension extends Container {
110110
ContainerAccessor? getter, setter;
111111
final fieldGetter = field.getter2;
112112
if (fieldGetter != null) {
113-
getter = ModelElement.for2_(fieldGetter, library, packageGraph,
113+
getter = ModelElement.for_(fieldGetter, library, packageGraph,
114114
enclosingContainer: this) as ContainerAccessor;
115115
}
116116
final fieldSetter = field.setter2;
117117
if (fieldSetter != null) {
118-
setter = ModelElement.for2_(fieldSetter, library, packageGraph,
118+
setter = ModelElement.for_(fieldSetter, library, packageGraph,
119119
enclosingContainer: this) as ContainerAccessor;
120120
}
121121
return getModelForPropertyInducingElement(field.asElement, library,

‎lib/src/model/extension_type.dart‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,15 @@ import 'package:meta/meta.dart';
1616

1717
class ExtensionType extends InheritingContainer with Constructable {
1818
@override
19-
final ExtensionTypeElement element;
19+
ExtensionTypeElement get element => element2.asElement;
2020

2121
@override
22-
ExtensionTypeElement2 get element2 =>
23-
element.asElement2 as ExtensionTypeElement2;
22+
final ExtensionTypeElement2 element2;
2423

2524
late final ElementType representationType =
2625
getTypeFor(element.representation.type, library);
2726

28-
ExtensionType(this.element, super.library, super.packageGraph);
27+
ExtensionType(this.element2, super.library, super.packageGraph);
2928

3029
@override
3130
Library get enclosingElement => library;

‎lib/src/model/field.dart‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class Field extends ModelElement
4242
this.setter,
4343
) : isInherited = false,
4444
enclosingElement =
45-
ModelElement.for_(element.enclosingElement3, library, packageGraph)
45+
ModelElement.for_(element.asElement2.enclosingElement2, library, packageGraph)
4646
as Container,
4747
assert(getter != null || setter != null) {
4848
getter?.enclosingCombo = this;
@@ -58,34 +58,36 @@ class Field extends ModelElement
5858
) : element = element2.asElement as FieldElement,
5959
isInherited = false,
6060
enclosingElement =
61-
ModelElement.for2_(element2.enclosingElement2!, library, packageGraph)
61+
ModelElement.for_(element2.enclosingElement2!, library, packageGraph)
6262
as Container,
6363
assert(getter != null || setter != null) {
6464
getter?.enclosingCombo = this;
6565
setter?.enclosingCombo = this;
6666
}
6767

6868
Field.providedByExtension(
69-
this.element,
69+
Element2 element2,
7070
this.enclosingElement,
7171
super.library,
7272
super.packageGraph,
7373
this.getter,
7474
this.setter,
75-
) : isInherited = false,
75+
) : element = element2.asElement as FieldElement,
76+
isInherited = false,
7677
assert(getter != null || setter != null) {
7778
getter?.enclosingCombo = this;
7879
setter?.enclosingCombo = this;
7980
}
8081

8182
Field.inherited(
82-
this.element,
83+
Element2 element2,
8384
this.enclosingElement,
8485
super.library,
8586
super.packageGraph,
8687
this.getter,
8788
this.setter,
88-
) : isInherited = true,
89+
) : element = element2.asElement as FieldElement,
90+
isInherited = true,
8991
assert(getter != null || setter != null) {
9092
// Can't set `isInherited` to true if this is the defining element, because
9193
// that would mean it isn't inherited.

‎lib/src/model/library.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ class Library extends ModelElement
120120
}
121121

122122
@override
123-
CompilationUnitElement get compilationUnitElement =>
124-
element.definingCompilationUnit;
123+
LibraryFragment get unitElement =>
124+
element2.library2.firstFragment;
125125

126126
@override
127127

0 commit comments

Comments
 (0)