Merge branch 'master' into functiontype-remove-members

dart-lang · Jun 3, 2021 · 7b2d063 · 7b2d063
2 parents 2a440a0 + e58ae4e
commit 7b2d063
Show file tree

Hide file tree

Showing 12 changed files with 2,276 additions and 1,152 deletions.
diff --git a/lib/src/generator/templates.aot_renderers_for_html.dart b/lib/src/generator/templates.aot_renderers_for_html.dart
diff --git a/lib/src/generator/templates.aot_renderers_for_md.dart b/lib/src/generator/templates.aot_renderers_for_md.dart
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -30,6 +30,7 @@ dev_dependencies:
   build_runner: ^2.0.1
   build_test: ^2.0.0
   build_version: ^2.0.1
+  code_builder: ^4.0.0
   coverage: ^1.0.2
   dart_style: ^2.0.0
   grinder: ^0.9.0-nullsafety.0

diff --git a/test/mustachio/aot_compiler_builder_test.dart b/test/mustachio/aot_compiler_builder_test.dart
@@ -9,51 +9,26 @@ import 'package:build/build.dart';
 import 'package:build_test/build_test.dart';
 import 'package:test/test.dart';
 
-import '../../tool/mustachio/builder.dart';
 import 'builder_test_base.dart';
 
 void main() {
   InMemoryAssetWriter writer;
 
-  Future<LibraryElement> resolveGeneratedLibrary(
-      InMemoryAssetWriter writer) async {
+  Future<LibraryElement> resolveGeneratedLibrary() async {
     var rendererAsset = AssetId('foo', 'lib/foo.aot_renderers_for_html.dart');
     var writtenStrings = writer.assets
         .map((id, content) => MapEntry(id.toString(), utf8.decode(content)));
     return await resolveSources(writtenStrings,
         (Resolver resolver) => resolver.libraryFor(rendererAsset));
   }
 
-  Future<void> testMustachioBuilder(
-    String sourceLibraryContent, {
-    String libraryFrontMatter = libraryFrontMatter,
-    Map<String, String> additionalAssets,
-  }) async {
-    sourceLibraryContent = '''
-$libraryFrontMatter
-$sourceLibraryContent
-''';
-    await testBuilder(
-      mustachioBuilder(BuilderOptions({})),
-      {
-        ...annotationsAsset,
-        'foo|lib/foo.dart': sourceLibraryContent,
-        'foo|lib/templates/html/foo.html': 'EMPTY',
-        'foo|lib/templates/md/foo.md': 'EMPTY',
-        'foo|lib/templates/html/bar.html': 'EMPTY',
-        'foo|lib/templates/md/bar.md': 'EMPTY',
-        ...?additionalAssets,
-      },
-      writer: writer,
-    );
-  }
-
   setUp(() {
     writer = InMemoryAssetWriter();
   });
 
   test('builds renderers from multiple annotations', () async {
     await testMustachioBuilder(
+      writer,
       '''
 class Foo {}
 class Bar {}
@@ -70,7 +45,7 @@ import 'package:mustachio/annotations.dart';
         'foo|lib/templates/html/_foo_header.html': 'EMPTY',
       },
     );
-    var renderersLibrary = await resolveGeneratedLibrary(writer);
+    var renderersLibrary = await resolveGeneratedLibrary();
 
     expect(renderersLibrary.getTopLevelFunction('renderFoo'), isNotNull);
     expect(renderersLibrary.getTopLevelFunction('renderBar'), isNotNull);
@@ -80,8 +55,7 @@ import 'package:mustachio/annotations.dart';
   }, timeout: Timeout.factor(2));
 
   test('builds a public API render function', () async {
-    writer = InMemoryAssetWriter();
-    await testMustachioBuilder('''
+    await testMustachioBuilder(writer, '''
 class Foo<T> {}
 ''', libraryFrontMatter: '''
 @Renderer(#renderFoo, Context<Foo>(), 'foo')
@@ -90,12 +64,13 @@ import 'package:mustachio/annotations.dart';
 ''');
     var rendererAsset = AssetId('foo', 'lib/foo.aot_renderers_for_html.dart');
     var generatedContent = utf8.decode(writer.assets[rendererAsset]);
-    expect(generatedContent, contains('String renderFoo<T>(Foo<T> context0)'));
+    expect(
+        generatedContent, contains('String renderFoo<T>(_i1.Foo<T> context0)'));
   });
 
   test('builds a private render function for a partial', () async {
-    writer = InMemoryAssetWriter();
     await testMustachioBuilder(
+      writer,
       '''
 class Foo<T> {}
 ''',
@@ -111,17 +86,19 @@ import 'package:mustachio/annotations.dart';
     );
     var rendererAsset = AssetId('foo', 'lib/foo.aot_renderers_for_html.dart');
     var generatedContent = utf8.decode(writer.assets[rendererAsset]);
-    expect(generatedContent,
-        contains('String _renderFoo_partial_foo_header_0<T>(Foo<T> context0)'));
+    expect(
+        generatedContent,
+        contains(
+            'String _renderFoo_partial_foo_header_0<T>(_i1.Foo<T> context0)'));
   });
 
   test('builds a renderer for a generic, bounded type', () async {
-    await testMustachioBuilder('''
+    await testMustachioBuilder(writer, '''
 class Foo<T extends num> {}
 class Bar {}
 class Baz {}
 ''');
-    var renderersLibrary = await resolveGeneratedLibrary(writer);
+    var renderersLibrary = await resolveGeneratedLibrary();
 
     var fooRenderFunction = renderersLibrary.getTopLevelFunction('renderFoo');
     expect(fooRenderFunction.typeParameters, hasLength(1));