Skip to content

Make a few more nullable fields late final #2883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 7, 2022
Merged

Make a few more nullable fields late final #2883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 24 additions & 27 deletions lib/src/generator/templates.runtime_renderers.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1699,11 +1699,11 @@ class _Renderer_Class extends RendererBase<Class> {
List<String> remainingNames) =>
self.renderSimpleVariable(
c, remainingNames, 'List<ModelElement>'),
isNullValue: (CT_ c) => c.allModelElements == null,
renderValue: (CT_ c, RendererBase<CT_> r,
renderIterable: (CT_ c, RendererBase<CT_> r,
List<MustachioNode> ast, StringSink sink) {
renderSimple(c.allModelElements, ast, r.template, sink,
parent: r, getters: _invisibleGetters['List']!);
return c.allModelElements.map((e) => _render_ModelElement(
e, ast, r.template, sink,
parent: r));
},
),
'constantFields': Property(
Expand Down Expand Up @@ -3688,11 +3688,11 @@ class _Renderer_ContainerMember extends RendererBase<ContainerMember> {
nextProperty,
[...remainingNames.skip(1)]);
},
isNullValue: (CT_ c) => c.definingEnclosingContainer == null,
isNullValue: (CT_ c) => false,
renderValue: (CT_ c, RendererBase<CT_> r,
List<MustachioNode> ast, StringSink sink) {
_render_Container(
c.definingEnclosingContainer!, ast, r.template, sink,
c.definingEnclosingContainer, ast, r.template, sink,
parent: r);
},
),
Expand Down Expand Up @@ -4741,11 +4741,11 @@ class _Renderer_Extension extends RendererBase<Extension> {
List<String> remainingNames) =>
self.renderSimpleVariable(
c, remainingNames, 'List<ModelElement>'),
isNullValue: (CT_ c) => c.allModelElements == null,
renderValue: (CT_ c, RendererBase<CT_> r,
renderIterable: (CT_ c, RendererBase<CT_> r,
List<MustachioNode> ast, StringSink sink) {
renderSimple(c.allModelElements, ast, r.template, sink,
parent: r, getters: _invisibleGetters['List']!);
return c.allModelElements.map((e) => _render_ModelElement(
e, ast, r.template, sink,
parent: r));
},
),
'alwaysApplies': Property(
Expand Down Expand Up @@ -6908,11 +6908,10 @@ class _Renderer_InheritingContainer extends RendererBase<InheritingContainer> {
List<String> remainingNames) =>
self.renderSimpleVariable(
c, remainingNames, 'List<Field>'),
isNullValue: (CT_ c) => c.allFields == null,
renderValue: (CT_ c, RendererBase<CT_> r,
renderIterable: (CT_ c, RendererBase<CT_> r,
List<MustachioNode> ast, StringSink sink) {
renderSimple(c.allFields, ast, r.template, sink,
parent: r, getters: _invisibleGetters['List']!);
return c.allFields.map((e) =>
_render_Field(e, ast, r.template, sink, parent: r));
},
),
'allModelElements': Property(
Expand All @@ -6921,11 +6920,11 @@ class _Renderer_InheritingContainer extends RendererBase<InheritingContainer> {
List<String> remainingNames) =>
self.renderSimpleVariable(
c, remainingNames, 'List<ModelElement>'),
isNullValue: (CT_ c) => c.allModelElements == null,
renderValue: (CT_ c, RendererBase<CT_> r,
renderIterable: (CT_ c, RendererBase<CT_> r,
List<MustachioNode> ast, StringSink sink) {
renderSimple(c.allModelElements, ast, r.template, sink,
parent: r, getters: _invisibleGetters['List']!);
return c.allModelElements.map((e) => _render_ModelElement(
e, ast, r.template, sink,
parent: r));
},
),
'constantFields': Property(
Expand Down Expand Up @@ -7120,24 +7119,22 @@ class _Renderer_InheritingContainer extends RendererBase<InheritingContainer> {
List<String> remainingNames) =>
self.renderSimpleVariable(
c, remainingNames, 'Iterable<Method>'),
isNullValue: (CT_ c) => c.inheritedMethods == null,
renderValue: (CT_ c, RendererBase<CT_> r,
renderIterable: (CT_ c, RendererBase<CT_> r,
List<MustachioNode> ast, StringSink sink) {
renderSimple(c.inheritedMethods, ast, r.template, sink,
parent: r, getters: _invisibleGetters['Iterable']!);
return c.inheritedMethods.map((e) =>
_render_Method(e, ast, r.template, sink, parent: r));
},
),
'inheritedOperators': Property(
getValue: (CT_ c) => c.inheritedOperators,
renderVariable: (CT_ c, Property<CT_> self,
List<String> remainingNames) =>
self.renderSimpleVariable(
c, remainingNames, 'Iterable<Operator>'),
isNullValue: (CT_ c) => c.inheritedOperators == null,
renderValue: (CT_ c, RendererBase<CT_> r,
c, remainingNames, 'List<Operator>'),
renderIterable: (CT_ c, RendererBase<CT_> r,
List<MustachioNode> ast, StringSink sink) {
renderSimple(c.inheritedOperators, ast, r.template, sink,
parent: r, getters: _invisibleGetters['Iterable']!);
return c.inheritedOperators.map((e) =>
_render_Operator(e, ast, r.template, sink, parent: r));
},
),
'instanceFields': Property(
Expand Down
19 changes: 8 additions & 11 deletions lib/src/model/class.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,13 @@ class Class extends InheritingContainer
packageGraph.specialClasses.addSpecial(this);
}

List<ModelElement>? _allModelElements;

@override
List<ModelElement>? get allModelElements {
_allModelElements ??= <ModelElement>[
...super.allModelElements!,
...constructors,
];
return _allModelElements;
}
// TODO(srawlins): Figure out what we elsewhere in dartdoc.
// ignore: overridden_fields
late final List<ModelElement> allModelElements = [
...super.allModelElements,
...constructors,
];

/// Returns the library that encloses this element.
@override
Expand Down Expand Up @@ -118,14 +115,14 @@ class Class extends InheritingContainer

@override
Iterable<Field> get instanceFields =>
_instanceFields ??= allFields!.where((f) => !f.isStatic);
_instanceFields ??= allFields.where((f) => !f.isStatic);

@override
bool get publicInheritedInstanceFields =>
publicInstanceFields.every((f) => f.isInherited);

@override
Iterable<Field> get constantFields => allFields!.where((f) => f.isConst);
Iterable<Field> get constantFields => allFields.where((f) => f.isConst);

static Iterable<MapEntry<String, CommentReferable>> _constructorGenerator(
Iterable<Constructor> source) sync* {
Expand Down
9 changes: 2 additions & 7 deletions lib/src/model/container_member.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,8 @@ mixin ContainerMember on ModelElement implements EnclosedElement {
// implemented.
bool get isExtended => false;

Container? _definingEnclosingContainer;

Container? get definingEnclosingContainer {
_definingEnclosingContainer ??=
modelBuilder.fromElement(element!.enclosingElement!) as Container?;
return _definingEnclosingContainer;
}
late final Container definingEnclosingContainer =
modelBuilder.fromElement(element!.enclosingElement!) as Container;

@override
Set<Feature> get features => {
Expand Down
16 changes: 6 additions & 10 deletions lib/src/model/extension.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,17 +92,13 @@ class Extension extends Container implements EnclosedElement {
return _typeParameters!;
}

List<ModelElement>? _allModelElements;
@override
List<ModelElement>? get allModelElements {
_allModelElements ??= List.from(
quiver.concat<ModelElement>([
super.allModelElements!,
typeParameters,
]),
growable: false);
return _allModelElements;
}
late final List<ModelElement> allModelElements = List.of(
quiver.concat<ModelElement>([
super.allModelElements!,
typeParameters,
]),
growable: false);

@override
String get filePath => '${library.dirName}/$fileName';
Expand Down
9 changes: 4 additions & 5 deletions lib/src/model/inheritable.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ mixin Inheritable on ContainerMember {
}
// This is still OK because we're never supposed to cloak public
// classes.
if (definingEnclosingContainer!.isCanonical &&
definingEnclosingContainer!.isPublic) {
if (definingEnclosingContainer.isCanonical &&
definingEnclosingContainer.isPublic) {
assert(definingEnclosingContainer == found);
}
if (found != null) {
Expand All @@ -116,8 +116,7 @@ mixin Inheritable on ContainerMember {
inheritance
.addAll((enclosingElement as InheritingContainer).inheritanceChain);
var object = packageGraph.specialClasses[SpecialClass.object];
if (!inheritance.contains(definingEnclosingContainer) &&
definingEnclosingContainer != null) {
if (!inheritance.contains(definingEnclosingContainer)) {
assert(definingEnclosingContainer == object);
}
// Unless the code explicitly extends dart-core's Object, we won't get
Expand Down Expand Up @@ -150,7 +149,7 @@ mixin Inheritable on ContainerMember {
enclosingElement!.canonicalModelElement as InheritingContainer?;
// The container in which this element was defined, canonical if available.
Container? definingCanonical =
definingEnclosingContainer!.canonicalModelElement as Container? ??
definingEnclosingContainer.canonicalModelElement as Container? ??
definingEnclosingContainer;
// The canonical version of the element we're overriding, if available.
var overriddenCanonical =
Expand Down
Loading