Skip to content

Commit ffd75b7

Browse files
srawlinssrawlins
authored
Correct some bad mustachio migration; migrate mustachio tests (#2879)
1 parent 2d4ef13 commit ffd75b7

8 files changed

+479
-479
lines changed

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

Lines changed: 400 additions & 393 deletions
Large diffs are not rendered by default.

‎lib/src/mustachio/renderer_base.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ class SimpleRenderer extends RendererBase<Object?> {
342342
/// An individual property of objects of type [T], including functions for
343343
/// rendering various types of Mustache nodes.
344344
@immutable
345-
class Property<T> {
345+
class Property<T extends Object?> {
346346
/// Gets the value of this property on the object [context].
347347
final Object? Function(T context) getValue;
348348

‎test/mustachio/aot_compiler_render_test.dart

Lines changed: 4 additions & 6 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-
// @dart=2.9
6-
75
import 'dart:async';
86
import 'dart:convert' show json, utf8;
97
import 'dart:io';
@@ -62,9 +60,9 @@ class Property3 {
6260
String? s;
6361
}
6462
''';
65-
InMemoryAssetWriter writer;
66-
Directory tempDir;
67-
File renderScript;
63+
late InMemoryAssetWriter writer;
64+
late Directory tempDir;
65+
late File renderScript;
6866

6967
setUp(() {
7068
writer = InMemoryAssetWriter();
@@ -87,7 +85,7 @@ import 'package:mustachio/annotations.dart';
8785
additionalAssets: additionalAssets,
8886
);
8987
var rendererAsset = AssetId('foo', 'lib/foo.aot_renderers_for_html.dart');
90-
var generatedContent = utf8.decode(writer.assets[rendererAsset]);
88+
var generatedContent = utf8.decode(writer.assets[rendererAsset]!);
9189
renderScript.writeAsStringSync('''
9290
import 'dart:io';
9391

‎test/mustachio/foo.runtime_renderers.dart

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,20 @@ import 'package:dartdoc/src/mustachio/renderer_base.dart';
2121
import 'package:dartdoc/src/warnings.dart';
2222
import 'foo.dart';
2323

24-
String renderBar(Bar? context, Template template) {
24+
String renderBar(Bar context, Template template) {
2525
var buffer = StringBuffer();
2626
_render_Bar(context, template.ast, template, buffer);
2727
return buffer.toString();
2828
}
2929

3030
void _render_Bar(
31-
Bar? context, List<MustachioNode> ast, Template template, StringSink sink,
31+
Bar context, List<MustachioNode> ast, Template template, StringSink sink,
3232
{RendererBase<Object>? parent}) {
3333
var renderer = Renderer_Bar(context, parent, template, sink);
3434
renderer.renderBlock(ast);
3535
}
3636

37-
class Renderer_Bar extends RendererBase<Bar?> {
37+
class Renderer_Bar extends RendererBase<Bar> {
3838
static final Map<Type, Object> _propertyMapCache = {};
3939
static Map<String, Property<CT_>> propertyMap<CT_ extends Bar>() =>
4040
_propertyMapCache.putIfAbsent(
@@ -57,7 +57,7 @@ class Renderer_Bar extends RendererBase<Bar?> {
5757
isNullValue: (CT_ c) => c.baz == null,
5858
renderValue: (CT_ c, RendererBase<CT_> r,
5959
List<MustachioNode> ast, StringSink sink) {
60-
_render_Baz(c.baz, ast, r.template, sink, parent: r);
60+
_render_Baz(c.baz!, ast, r.template, sink, parent: r);
6161
},
6262
),
6363
'foo': Property(
@@ -76,7 +76,7 @@ class Renderer_Bar extends RendererBase<Bar?> {
7676
isNullValue: (CT_ c) => c.foo == null,
7777
renderValue: (CT_ c, RendererBase<CT_> r,
7878
List<MustachioNode> ast, StringSink sink) {
79-
_render_Foo(c.foo, ast, r.template, sink, parent: r);
79+
_render_Foo(c.foo!, ast, r.template, sink, parent: r);
8080
},
8181
),
8282
'l1': Property(
@@ -100,12 +100,12 @@ class Renderer_Bar extends RendererBase<Bar?> {
100100
),
101101
}) as Map<String, Property<CT_>>;
102102

103-
Renderer_Bar(Bar? context, RendererBase<Object>? parent, Template template,
103+
Renderer_Bar(Bar context, RendererBase<Object>? parent, Template template,
104104
StringSink sink)
105105
: super(context, parent, template, sink);
106106

107107
@override
108-
Property<Bar?>? getProperty(String key) {
108+
Property<Bar>? getProperty(String key) {
109109
if (propertyMap<Bar>().containsKey(key)) {
110110
return propertyMap<Bar>()[key];
111111
} else {
@@ -114,20 +114,20 @@ class Renderer_Bar extends RendererBase<Bar?> {
114114
}
115115
}
116116

117-
String renderBaz(Baz? context, Template template) {
117+
String renderBaz(Baz context, Template template) {
118118
var buffer = StringBuffer();
119119
_render_Baz(context, template.ast, template, buffer);
120120
return buffer.toString();
121121
}
122122

123123
void _render_Baz(
124-
Baz? context, List<MustachioNode> ast, Template template, StringSink sink,
124+
Baz context, List<MustachioNode> ast, Template template, StringSink sink,
125125
{RendererBase<Object>? parent}) {
126126
var renderer = Renderer_Baz(context, parent, template, sink);
127127
renderer.renderBlock(ast);
128128
}
129129

130-
class Renderer_Baz extends RendererBase<Baz?> {
130+
class Renderer_Baz extends RendererBase<Baz> {
131131
static final Map<Type, Object> _propertyMapCache = {};
132132
static Map<String, Property<CT_>> propertyMap<CT_ extends Baz>() =>
133133
_propertyMapCache.putIfAbsent(
@@ -150,17 +150,17 @@ class Renderer_Baz extends RendererBase<Baz?> {
150150
isNullValue: (CT_ c) => c.bar == null,
151151
renderValue: (CT_ c, RendererBase<CT_> r,
152152
List<MustachioNode> ast, StringSink sink) {
153-
_render_Bar(c.bar, ast, r.template, sink, parent: r);
153+
_render_Bar(c.bar!, ast, r.template, sink, parent: r);
154154
},
155155
),
156156
}) as Map<String, Property<CT_>>;
157157

158-
Renderer_Baz(Baz? context, RendererBase<Object>? parent, Template template,
158+
Renderer_Baz(Baz context, RendererBase<Object>? parent, Template template,
159159
StringSink sink)
160160
: super(context, parent, template, sink);
161161

162162
@override
163-
Property<Baz?>? getProperty(String key) {
163+
Property<Baz>? getProperty(String key) {
164164
if (propertyMap<Baz>().containsKey(key)) {
165165
return propertyMap<Baz>()[key];
166166
} else {
@@ -169,20 +169,20 @@ class Renderer_Baz extends RendererBase<Baz?> {
169169
}
170170
}
171171

172-
String renderFoo(Foo? context, Template template) {
172+
String renderFoo(Foo context, Template template) {
173173
var buffer = StringBuffer();
174174
_render_Foo(context, template.ast, template, buffer);
175175
return buffer.toString();
176176
}
177177

178178
void _render_Foo(
179-
Foo? context, List<MustachioNode> ast, Template template, StringSink sink,
179+
Foo context, List<MustachioNode> ast, Template template, StringSink sink,
180180
{RendererBase<Object>? parent}) {
181181
var renderer = Renderer_Foo(context, parent, template, sink);
182182
renderer.renderBlock(ast);
183183
}
184184

185-
class Renderer_Foo extends RendererBase<Foo?> {
185+
class Renderer_Foo extends RendererBase<Foo> {
186186
static final Map<Type, Object> _propertyMapCache = {};
187187
static Map<String, Property<CT_>> propertyMap<CT_ extends Foo>() =>
188188
_propertyMapCache.putIfAbsent(
@@ -212,7 +212,7 @@ class Renderer_Foo extends RendererBase<Foo?> {
212212
isNullValue: (CT_ c) => c.baz == null,
213213
renderValue: (CT_ c, RendererBase<CT_> r,
214214
List<MustachioNode> ast, StringSink sink) {
215-
_render_Baz(c.baz, ast, r.template, sink, parent: r);
215+
_render_Baz(c.baz!, ast, r.template, sink, parent: r);
216216
},
217217
),
218218
'l1': Property(
@@ -257,7 +257,7 @@ class Renderer_Foo extends RendererBase<Foo?> {
257257
isNullValue: (CT_ c) => c.p1 == null,
258258
renderValue: (CT_ c, RendererBase<CT_> r,
259259
List<MustachioNode> ast, StringSink sink) {
260-
_render_Property1(c.p1, ast, r.template, sink, parent: r);
260+
_render_Property1(c.p1!, ast, r.template, sink, parent: r);
261261
},
262262
),
263263
's1': Property(
@@ -274,12 +274,12 @@ class Renderer_Foo extends RendererBase<Foo?> {
274274
),
275275
}) as Map<String, Property<CT_>>;
276276

277-
Renderer_Foo(Foo? context, RendererBase<Object>? parent, Template template,
277+
Renderer_Foo(Foo context, RendererBase<Object>? parent, Template template,
278278
StringSink sink)
279279
: super(context, parent, template, sink);
280280

281281
@override
282-
Property<Foo?>? getProperty(String key) {
282+
Property<Foo>? getProperty(String key) {
283283
if (propertyMap<Foo>().containsKey(key)) {
284284
return propertyMap<Foo>()[key];
285285
} else {
@@ -288,7 +288,7 @@ class Renderer_Foo extends RendererBase<Foo?> {
288288
}
289289
}
290290

291-
class Renderer_FooBase<T extends Object> extends RendererBase<FooBase<T>?> {
291+
class Renderer_FooBase<T extends Object> extends RendererBase<FooBase<T>> {
292292
static final Map<Type, Object> _propertyMapCache = {};
293293
static Map<String, Property<CT_>>
294294
propertyMap<T extends Object, CT_ extends FooBase>() =>
@@ -320,12 +320,12 @@ class Renderer_FooBase<T extends Object> extends RendererBase<FooBase<T>?> {
320320
),
321321
}) as Map<String, Property<CT_>>;
322322

323-
Renderer_FooBase(FooBase<T>? context, RendererBase<Object>? parent,
323+
Renderer_FooBase(FooBase<T> context, RendererBase<Object>? parent,
324324
Template template, StringSink sink)
325325
: super(context, parent, template, sink);
326326

327327
@override
328-
Property<FooBase<T>?>? getProperty(String key) {
328+
Property<FooBase<T>>? getProperty(String key) {
329329
if (propertyMap<T, FooBase<T>>().containsKey(key)) {
330330
return propertyMap<T, FooBase<T>>()[key];
331331
} else {
@@ -334,7 +334,7 @@ class Renderer_FooBase<T extends Object> extends RendererBase<FooBase<T>?> {
334334
}
335335
}
336336

337-
class Renderer_Mixin1 extends RendererBase<Mixin1?> {
337+
class Renderer_Mixin1 extends RendererBase<Mixin1> {
338338
static final Map<Type, Object> _propertyMapCache = {};
339339
static Map<String, Property<CT_>> propertyMap<CT_ extends Mixin1>() =>
340340
_propertyMapCache.putIfAbsent(
@@ -358,17 +358,17 @@ class Renderer_Mixin1 extends RendererBase<Mixin1?> {
358358
isNullValue: (CT_ c) => c.p3 == null,
359359
renderValue: (CT_ c, RendererBase<CT_> r,
360360
List<MustachioNode> ast, StringSink sink) {
361-
_render_Property3(c.p3, ast, r.template, sink, parent: r);
361+
_render_Property3(c.p3!, ast, r.template, sink, parent: r);
362362
},
363363
),
364364
}) as Map<String, Property<CT_>>;
365365

366-
Renderer_Mixin1(Mixin1? context, RendererBase<Object>? parent,
366+
Renderer_Mixin1(Mixin1 context, RendererBase<Object>? parent,
367367
Template template, StringSink sink)
368368
: super(context, parent, template, sink);
369369

370370
@override
371-
Property<Mixin1?>? getProperty(String key) {
371+
Property<Mixin1>? getProperty(String key) {
372372
if (propertyMap<Mixin1>().containsKey(key)) {
373373
return propertyMap<Mixin1>()[key];
374374
} else {
@@ -377,7 +377,7 @@ class Renderer_Mixin1 extends RendererBase<Mixin1?> {
377377
}
378378
}
379379

380-
class Renderer_Object extends RendererBase<Object?> {
380+
class Renderer_Object extends RendererBase<Object> {
381381
static final Map<Type, Object> _propertyMapCache = {};
382382
static Map<String, Property<CT_>> propertyMap<CT_ extends Object>() =>
383383
_propertyMapCache.putIfAbsent(
@@ -397,12 +397,12 @@ class Renderer_Object extends RendererBase<Object?> {
397397
),
398398
}) as Map<String, Property<CT_>>;
399399

400-
Renderer_Object(Object? context, RendererBase<Object>? parent,
400+
Renderer_Object(Object context, RendererBase<Object>? parent,
401401
Template template, StringSink sink)
402402
: super(context, parent, template, sink);
403403

404404
@override
405-
Property<Object?>? getProperty(String key) {
405+
Property<Object>? getProperty(String key) {
406406
if (propertyMap<Object>().containsKey(key)) {
407407
return propertyMap<Object>()[key];
408408
} else {
@@ -411,14 +411,14 @@ class Renderer_Object extends RendererBase<Object?> {
411411
}
412412
}
413413

414-
void _render_Property1(Property1? context, List<MustachioNode> ast,
414+
void _render_Property1(Property1 context, List<MustachioNode> ast,
415415
Template template, StringSink sink,
416416
{RendererBase<Object>? parent}) {
417417
var renderer = Renderer_Property1(context, parent, template, sink);
418418
renderer.renderBlock(ast);
419419
}
420420

421-
class Renderer_Property1 extends RendererBase<Property1?> {
421+
class Renderer_Property1 extends RendererBase<Property1> {
422422
static final Map<Type, Object> _propertyMapCache = {};
423423
static Map<String, Property<CT_>> propertyMap<CT_ extends Property1>() =>
424424
_propertyMapCache.putIfAbsent(
@@ -443,17 +443,17 @@ class Renderer_Property1 extends RendererBase<Property1?> {
443443
isNullValue: (CT_ c) => c.p2 == null,
444444
renderValue: (CT_ c, RendererBase<CT_> r,
445445
List<MustachioNode> ast, StringSink sink) {
446-
_render_Property2(c.p2, ast, r.template, sink, parent: r);
446+
_render_Property2(c.p2!, ast, r.template, sink, parent: r);
447447
},
448448
),
449449
}) as Map<String, Property<CT_>>;
450450

451-
Renderer_Property1(Property1? context, RendererBase<Object>? parent,
451+
Renderer_Property1(Property1 context, RendererBase<Object>? parent,
452452
Template template, StringSink sink)
453453
: super(context, parent, template, sink);
454454

455455
@override
456-
Property<Property1?>? getProperty(String key) {
456+
Property<Property1>? getProperty(String key) {
457457
if (propertyMap<Property1>().containsKey(key)) {
458458
return propertyMap<Property1>()[key];
459459
} else {
@@ -462,14 +462,14 @@ class Renderer_Property1 extends RendererBase<Property1?> {
462462
}
463463
}
464464

465-
void _render_Property2(Property2? context, List<MustachioNode> ast,
465+
void _render_Property2(Property2 context, List<MustachioNode> ast,
466466
Template template, StringSink sink,
467467
{RendererBase<Object>? parent}) {
468468
var renderer = Renderer_Property2(context, parent, template, sink);
469469
renderer.renderBlock(ast);
470470
}
471471

472-
class Renderer_Property2 extends RendererBase<Property2?> {
472+
class Renderer_Property2 extends RendererBase<Property2> {
473473
static final Map<Type, Object> _propertyMapCache = {};
474474
static Map<String, Property<CT_>> propertyMap<CT_ extends Property2>() =>
475475
_propertyMapCache.putIfAbsent(
@@ -491,12 +491,12 @@ class Renderer_Property2 extends RendererBase<Property2?> {
491491
),
492492
}) as Map<String, Property<CT_>>;
493493

494-
Renderer_Property2(Property2? context, RendererBase<Object>? parent,
494+
Renderer_Property2(Property2 context, RendererBase<Object>? parent,
495495
Template template, StringSink sink)
496496
: super(context, parent, template, sink);
497497

498498
@override
499-
Property<Property2?>? getProperty(String key) {
499+
Property<Property2>? getProperty(String key) {
500500
if (propertyMap<Property2>().containsKey(key)) {
501501
return propertyMap<Property2>()[key];
502502
} else {
@@ -505,14 +505,14 @@ class Renderer_Property2 extends RendererBase<Property2?> {
505505
}
506506
}
507507

508-
void _render_Property3(Property3? context, List<MustachioNode> ast,
508+
void _render_Property3(Property3 context, List<MustachioNode> ast,
509509
Template template, StringSink sink,
510510
{RendererBase<Object>? parent}) {
511511
var renderer = Renderer_Property3(context, parent, template, sink);
512512
renderer.renderBlock(ast);
513513
}
514514

515-
class Renderer_Property3 extends RendererBase<Property3?> {
515+
class Renderer_Property3 extends RendererBase<Property3> {
516516
static final Map<Type, Object> _propertyMapCache = {};
517517
static Map<String, Property<CT_>> propertyMap<CT_ extends Property3>() =>
518518
_propertyMapCache.putIfAbsent(
@@ -533,12 +533,12 @@ class Renderer_Property3 extends RendererBase<Property3?> {
533533
),
534534
}) as Map<String, Property<CT_>>;
535535

536-
Renderer_Property3(Property3? context, RendererBase<Object>? parent,
536+
Renderer_Property3(Property3 context, RendererBase<Object>? parent,
537537
Template template, StringSink sink)
538538
: super(context, parent, template, sink);
539539

540540
@override
541-
Property<Property3?>? getProperty(String key) {
541+
Property<Property3>? getProperty(String key) {
542542
if (propertyMap<Property3>().containsKey(key)) {
543543
return propertyMap<Property3>()[key];
544544
} else {

‎test/mustachio/renderers_output_test.dart

Lines changed: 1 addition & 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-
// @dart=2.9
6-
75
library dartdoc.dartdoc_test;
86

97
import 'dart:async';
@@ -86,8 +84,7 @@ void main() {
8684
if (aotResource.shortName == '.') continue;
8785
if (aotResource.shortName == '..') continue;
8886
if (aotResource.shortName == 'static-assets') continue;
89-
expect(runtimeResource is Folder, true);
90-
checkDirectories(aotResource, runtimeResource);
87+
checkDirectories(aotResource, runtimeResource as Folder);
9188
} else if (aotResource is File) {
9289
expect(runtimeResource is File, true);
9390
var contentInAot = aotResource.readAsStringSync();

0 commit comments

Comments
 (0)