Skip to content

Commit e3233ec

Browse files
authored
Update mustache4dart and clean up templates (#1540)
* Import templating cleanups from canonicalization overhaul * Fix regression in Field appearance on edge cases * dartfmt * Add tests * regenerate test package docs * Review comment
1 parent 56a0148 commit e3233ec

File tree

263 files changed

+2539
-2677
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

263 files changed

+2539
-2677
lines changed

lib/src/element_type.dart

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ class ElementType {
1515
final ModelElement element;
1616
String _linkedName;
1717

18-
ElementType(this._type, this.element);
18+
ElementType(this._type, this.element) {
19+
assert(element != null);
20+
}
1921

2022
bool get isDynamic => _type.isDynamic;
2123

@@ -82,7 +84,9 @@ class ElementType {
8284
} else {
8385
typeArguments = type.typeFormals.map((f) => f.type);
8486
}
85-
return typeArguments.map(_getElementTypeFrom).toList();
87+
return typeArguments
88+
.map(_getElementTypeFrom)
89+
.toList();
8690
} else {
8791
return (_type as ParameterizedType)
8892
.typeArguments
@@ -129,6 +133,11 @@ class ElementType {
129133
// can happen if element is dynamic
130134
if (f.element.library != null) {
131135
lib = new ModelElement.from(f.element.library, element.library);
136+
} else {
137+
// TODO(jcollins-g): Assigning libraries to dynamics doesn't make sense,
138+
// really, but is needed for .package.
139+
assert(f.element.kind == ElementKind.DYNAMIC);
140+
lib = element.library;
132141
}
133142
return new ElementType(f, new ModelElement.from(f.element, lib));
134143
}

lib/src/html/html_generator_instance.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ class HtmlGeneratorInstance implements HtmlOptions {
5353
await _copyResources();
5454
if (faviconPath != null) {
5555
var bytes = new File(faviconPath).readAsBytesSync();
56+
// Allow overwrite of favicon.
57+
String filename = path.join(out.path, 'static-assets', 'favicon.png');
58+
writtenFiles.remove(filename);
5659
_writeFile(path.join(out.path, 'static-assets', 'favicon.png'), bytes);
5760
}
5861
}

0 commit comments

Comments
 (0)