Skip to content

Cleanup model_element migration and surrounding accesses #2876

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 3 commits into from
Dec 31, 2021
Merged

Cleanup model_element migration and surrounding accesses #2876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24a1a90
Cleanup model_element migration and surrounding accesses
parlough Dec 31, 2021
c11d877
More minor improvements
parlough Dec 31, 2021
2b1884c
Rebuild renderer for reduced null cases
parlough Dec 31, 2021
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
22 changes: 10 additions & 12 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 @@ -376,7 +376,7 @@ class _Renderer_Accessor extends RendererBase<Accessor?> {
nextProperty,
[...remainingNames.skip(1)]);
},
isNullValue: (CT_ c) => c.sourceCode == null,
isNullValue: (CT_ c) => false,
renderValue: (CT_ c, RendererBase<CT_> r,
List<MustachioNode> ast, StringSink sink) {
_render_String(c.sourceCode, ast, r.template, sink,
Expand Down Expand Up @@ -5872,7 +5872,7 @@ class _Renderer_Field extends RendererBase<Field?> {
nextProperty,
[...remainingNames.skip(1)]);
},
isNullValue: (CT_ c) => c.sourceCode == null,
isNullValue: (CT_ c) => false,
renderValue: (CT_ c, RendererBase<CT_> r,
List<MustachioNode> ast, StringSink sink) {
_render_String(c.sourceCode, ast, r.template, sink,
Expand Down Expand Up @@ -9930,11 +9930,10 @@ class _Renderer_ModelElement extends RendererBase<ModelElement?> {
List<String> remainingNames) =>
self.renderSimpleVariable(
c, remainingNames, 'List<Parameter>'),
isNullValue: (CT_ c) => c.allParameters == null,
renderValue: (CT_ c, RendererBase<CT_> r,
renderIterable: (CT_ c, RendererBase<CT_> r,
List<MustachioNode> ast, StringSink sink) {
renderSimple(c.allParameters, ast, r.template, sink,
parent: r, getters: _invisibleGetters['List']!);
return c.allParameters.map((e) =>
_render_Parameter(e, ast, r.template, sink, parent: r));
},
),
'annotations': Property(
Expand Down Expand Up @@ -10339,8 +10338,7 @@ class _Renderer_ModelElement extends RendererBase<ModelElement?> {
nextProperty,
[...remainingNames.skip(1)]);
},
isNullValue: (CT_ c) =>
c.fullyQualifiedNameWithoutLibrary == null,
isNullValue: (CT_ c) => false,
renderValue: (CT_ c, RendererBase<CT_> r,
List<MustachioNode> ast, StringSink sink) {
_render_String(c.fullyQualifiedNameWithoutLibrary, ast,
Expand Down Expand Up @@ -10440,7 +10438,7 @@ class _Renderer_ModelElement extends RendererBase<ModelElement?> {
nextProperty,
[...remainingNames.skip(1)]);
},
isNullValue: (CT_ c) => c.htmlId == null,
isNullValue: (CT_ c) => false,
renderValue: (CT_ c, RendererBase<CT_> r,
List<MustachioNode> ast, StringSink sink) {
_render_String(c.htmlId, ast, r.template, sink, parent: r);
Expand Down Expand Up @@ -10881,7 +10879,7 @@ class _Renderer_ModelElement extends RendererBase<ModelElement?> {
nextProperty,
[...remainingNames.skip(1)]);
},
isNullValue: (CT_ c) => c.sourceCode == null,
isNullValue: (CT_ c) => false,
renderValue: (CT_ c, RendererBase<CT_> r,
List<MustachioNode> ast, StringSink sink) {
_render_String(c.sourceCode, ast, r.template, sink,
Expand Down Expand Up @@ -10925,7 +10923,7 @@ class _Renderer_ModelElement extends RendererBase<ModelElement?> {
nextProperty,
[...remainingNames.skip(1)]);
},
isNullValue: (CT_ c) => c.sourceHref == null,
isNullValue: (CT_ c) => false,
renderValue: (CT_ c, RendererBase<CT_> r,
List<MustachioNode> ast, StringSink sink) {
_render_String(c.sourceHref, ast, r.template, sink,
Expand Down Expand Up @@ -13339,7 +13337,7 @@ class _Renderer_SourceCodeMixin extends RendererBase<SourceCodeMixin?> {
nextProperty,
[...remainingNames.skip(1)]);
},
isNullValue: (CT_ c) => c.sourceCode == null,
isNullValue: (CT_ c) => false,
renderValue: (CT_ c, RendererBase<CT_> r,
List<MustachioNode> ast, StringSink sink) {
_render_String(c.sourceCode, ast, r.template, sink,
Expand Down
17 changes: 5 additions & 12 deletions lib/src/model/accessor.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,20 +55,13 @@ class Accessor extends ModelElement implements EnclosedElement {
late final GetterSetterCombo definingCombo =
modelBuilder.fromElement(element.variable) as GetterSetterCombo;

String? _sourceCode;
late final String _sourceCode = isSynthetic
? _sourceCodeRenderer.renderSourceCode(
packageGraph.getModelNodeFor(definingCombo.element)!.sourceCode)
: super.sourceCode;

@override
String? get sourceCode {
if (_sourceCode == null) {
if (isSynthetic) {
_sourceCode = _sourceCodeRenderer.renderSourceCode(
packageGraph.getModelNodeFor(definingCombo.element)!.sourceCode!);
} else {
_sourceCode = super.sourceCode;
}
}
return _sourceCode;
}
String get sourceCode => _sourceCode;

bool _documentationCommentComputed = false;
String? _documentationComment;
Expand Down
2 changes: 1 addition & 1 deletion lib/src/model/constructor.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class Constructor extends ModelElement
Map<String, CommentReferable> get referenceChildren {
if (_referenceChildren == null) {
_referenceChildren = {};
_referenceChildren!.addEntries(allParameters!.map((param) {
_referenceChildren!.addEntries(allParameters.map((param) {
var paramElement = param.element;
if (paramElement is FieldFormalParameterElement) {
return modelBuilder.fromElement(paramElement.field!);
Expand Down
49 changes: 23 additions & 26 deletions lib/src/model/field.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,34 +137,31 @@ class Field extends ModelElement
SourceCodeRenderer get _sourceCodeRenderer =>
packageGraph.rendererFactory.sourceCodeRenderer;

String? _sourceCode;

@override
String? get sourceCode {
if (_sourceCode == null) {
// We could use a set to figure the dupes out, but that would lose ordering.
var fieldSourceCode = modelNode!.sourceCode ?? '';
var getterSourceCode = getter?.sourceCode ?? '';
var setterSourceCode = setter?.sourceCode ?? '';
var buffer = StringBuffer();
if (fieldSourceCode.isNotEmpty) {
fieldSourceCode = _sourceCodeRenderer.renderSourceCode(fieldSourceCode);
buffer.write(fieldSourceCode);
}
if (buffer.isNotEmpty) buffer.write('\n\n');
if (fieldSourceCode != getterSourceCode) {
if (getterSourceCode != setterSourceCode) {
buffer.write(getterSourceCode);
if (buffer.isNotEmpty) buffer.write('\n\n');
}
}
if (fieldSourceCode != setterSourceCode) {
buffer.write(setterSourceCode);
late final String _sourceCode = () {
// We could use a set to figure the dupes out, but that would lose ordering.
var fieldSourceCode = modelNode?.sourceCode ?? '';
var getterSourceCode = getter?.sourceCode ?? '';
var setterSourceCode = setter?.sourceCode ?? '';
var buffer = StringBuffer();
if (fieldSourceCode.isNotEmpty) {
fieldSourceCode = _sourceCodeRenderer.renderSourceCode(fieldSourceCode);
buffer.write(fieldSourceCode);
}
if (buffer.isNotEmpty) buffer.write('\n\n');
if (fieldSourceCode != getterSourceCode) {
if (getterSourceCode != setterSourceCode) {
buffer.write(getterSourceCode);
if (buffer.isNotEmpty) buffer.write('\n\n');
}
_sourceCode = buffer.toString();
}
return _sourceCode;
}
if (fieldSourceCode != setterSourceCode) {
buffer.write(setterSourceCode);
}
return buffer.toString();
}();

@override
String get sourceCode => _sourceCode;

@override
Library get library => super.library!;
Expand Down
2 changes: 1 addition & 1 deletion lib/src/model/method.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ class Method extends ModelElement
_referenceChildren = {};
_referenceChildren!.addEntriesIfAbsent([
...typeParameters.explicitOnCollisionWith(this),
...allParameters!.explicitOnCollisionWith(this),
...allParameters.explicitOnCollisionWith(this),
...modelType.typeArguments.explicitOnCollisionWith(this),
...modelType.returnType.typeArguments.explicitOnCollisionWith(this),
]);
Expand Down
Loading