From 6156d2e741b00056bffd4e8d8ba6fda8cdd1bbc7 Mon Sep 17 00:00:00 2001
From: Sam Rawlins <srawlins@google.com>
Date: Tue, 27 May 2025 20:46:02 -0700
Subject: [PATCH] Remove Templates.fromContext and as a result, make code more
 synchronous.

Since "runtime template" support was removed, we could remove the
`forceRuntimeTemplates` parameter from `Templates.fromContext`. However, the
result of this is that calling `Templates.fromContext` would not need the
`DartdocGeneratorOptionContext` parameter either, and is then just an alias for
the `HtmlAotTemplates` constructor. So we can remove the function altogether.

Since we no longer need to `await` the result of calling this function (which
is now a constructor call), we can make more and more functions synchronous
(see
https://journal.stuffwithstuff.com/2015/02/01/what-color-is-your-function/):
`bin/dartdoc.dart`'s `main`, `Dartdoc.fromContext` (which can new be a factory
constructor), `initHtmlGenerator`, `buildDartdoc`, `generatorContextFromArgv`,
`createPackageBuilder`.

We can also remove some more code that becomes dead:
`RuntimeTemplates._create`, ResourceProvider utilities, and some trivial
`buildDartdoc` test helpers.
---
 bin/dartdoc.dart                          |   6 +-
 lib/src/dartdoc.dart                      |  11 +-
 lib/src/generator/html_generator.dart     |  11 +-
 lib/src/generator/resource_loader.dart    |  23 +----
 lib/src/generator/templates.dart          |  76 +-------------
 test/dartdoc_test_base.dart               |   8 +-
 test/end2end/dartdoc_test.dart            |  24 ++---
 test/mustachio/renderers_output_test.dart | 118 ----------------------
 test/options_test.dart                    |  35 +++----
 test/resource_loader_test.dart            |  24 -----
 test/src/utils.dart                       |   4 +-
 test/templates/category_test.dart         |  20 ++--
 test/templates/enum_test.dart             |   4 +-
 test/templates/extension_test.dart        |  17 ++--
 test/templates/template_test_base.dart    |   2 +-
 15 files changed, 61 insertions(+), 322 deletions(-)
 delete mode 100644 test/mustachio/renderers_output_test.dart
 delete mode 100644 test/resource_loader_test.dart

diff --git a/bin/dartdoc.dart b/bin/dartdoc.dart
index 1427a4e841..a79652d2ff 100644
--- a/bin/dartdoc.dart
+++ b/bin/dartdoc.dart
@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'dart:async';
-
 import 'package:dartdoc/src/dartdoc.dart';
 import 'package:dartdoc/src/dartdoc_options.dart';
 import 'package:dartdoc/src/model/model.dart';
@@ -12,7 +10,7 @@ import 'package:dartdoc/src/package_meta.dart';
 
 /// Analyzes Dart files and generates a representation of included libraries,
 /// classes, and members. Uses the current directory to look for libraries.
-Future<void> main(List<String> arguments) async {
+void main(List<String> arguments) {
   var config = parseOptions(pubPackageMetaProvider, arguments);
   if (config == null) {
     // Do not run dartdoc as there was either a fatal error parsing options, or
@@ -23,7 +21,7 @@ Future<void> main(List<String> arguments) async {
   final packageBuilder =
       PubPackageBuilder(config, pubPackageMetaProvider, packageConfigProvider);
   final dartdoc = config.generateDocs
-      ? await Dartdoc.fromContext(config, packageBuilder)
+      ? Dartdoc.fromContext(config, packageBuilder)
       : Dartdoc.withEmptyGenerator(config, packageBuilder);
   dartdoc.executeGuarded();
 }
diff --git a/lib/src/dartdoc.dart b/lib/src/dartdoc.dart
index ccbcb28c8f..4ed7e9abb6 100644
--- a/lib/src/dartdoc.dart
+++ b/lib/src/dartdoc.dart
@@ -145,7 +145,7 @@ class Dartdoc {
   set generator(Generator newGenerator) => _generator = newGenerator;
 
   /// Factory method that builds Dartdoc with an empty generator.
-  static Dartdoc withEmptyGenerator(
+  factory Dartdoc.withEmptyGenerator(
     DartdocOptionContext config,
     PackageBuilder packageBuilder,
   ) {
@@ -157,12 +157,11 @@ class Dartdoc {
     );
   }
 
-  /// Asynchronous factory method that builds Dartdoc with a generator
-  /// determined by the given context.
-  static Future<Dartdoc> fromContext(
+  /// Builds Dartdoc with a generator determined by [context].
+  factory Dartdoc.fromContext(
     DartdocGeneratorOptionContext context,
     PackageBuilder packageBuilder,
-  ) async {
+  ) {
     var resourceProvider = context.resourceProvider;
     var outputPath = resourceProvider.pathContext.absolute(context.output);
     var outputDir = resourceProvider.getFolder(outputPath)..create();
@@ -175,7 +174,7 @@ class Dartdoc {
     return Dartdoc._(
       context,
       outputDir,
-      await initHtmlGenerator(context, writer: writer),
+      initHtmlGenerator(context, writer: writer),
       packageBuilder,
     );
   }
diff --git a/lib/src/generator/html_generator.dart b/lib/src/generator/html_generator.dart
index a3a2623fef..c179e3eefe 100644
--- a/lib/src/generator/html_generator.dart
+++ b/lib/src/generator/html_generator.dart
@@ -12,18 +12,13 @@ import 'package:dartdoc/src/generator/template_data.dart';
 import 'package:dartdoc/src/generator/templates.dart';
 import 'package:dartdoc/src/model/model.dart';
 import 'package:dartdoc/src/runtime_stats.dart';
-import 'package:meta/meta.dart';
 
 /// Creates a [Generator] with an [HtmlGeneratorBackend] backend.
-///
-/// [forceRuntimeTemplates] should only be given `true` during tests.
-Future<Generator> initHtmlGenerator(
+Generator initHtmlGenerator(
   DartdocGeneratorOptionContext context, {
   required FileWriter writer,
-  @visibleForTesting bool forceRuntimeTemplates = false,
-}) async {
-  var templates = await Templates.fromContext(context,
-      forceRuntimeTemplates: forceRuntimeTemplates);
+}) {
+  var templates = HtmlAotTemplates();
   var options = DartdocGeneratorBackendOptions.fromContext(context);
   var backend = HtmlGeneratorBackend(
       options, templates, writer, context.resourceProvider);
diff --git a/lib/src/generator/resource_loader.dart b/lib/src/generator/resource_loader.dart
index 70b0a1094d..847b59aca3 100644
--- a/lib/src/generator/resource_loader.dart
+++ b/lib/src/generator/resource_loader.dart
@@ -5,33 +5,12 @@
 /// Make it possible to load resources from the dartdoc code repository.
 library;
 
-import 'dart:convert' show utf8;
 import 'dart:isolate' show Isolate;
+
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:meta/meta.dart';
 
 extension ResourceLoader on ResourceProvider {
-  /// Loads a `package:` resource as a String.
-  Future<String> loadResourceAsString(String path) async {
-    var bytes = await loadResourceAsBytes(path);
-
-    return utf8.decode(bytes);
-  }
-
-  /// Loads a `package:` resource as an [List<int>].
-  Future<List<int>> loadResourceAsBytes(String path) async {
-    if (!path.startsWith('package:')) {
-      throw ArgumentError('path must begin with package:');
-    }
-
-    return (await getResourceFile(path)).readAsBytesSync();
-  }
-
-  Future<File> getResourceFile(String path) async {
-    var uri = await resolveResourceUri(Uri.parse(path));
-    return getFile(uri.toFilePath());
-  }
-
   Future<Folder> getResourceFolder(String path) async {
     var uri = await resolveResourceUri(Uri.parse(path));
     return getFolder(uri.toFilePath());
diff --git a/lib/src/generator/templates.dart b/lib/src/generator/templates.dart
index f7b3993cb7..daff1f0e67 100644
--- a/lib/src/generator/templates.dart
+++ b/lib/src/generator/templates.dart
@@ -42,11 +42,7 @@
 @Renderer(#renderTypedef, Context<TypedefTemplateData>(), 'typedef')
 library;
 
-import 'package:analyzer/file_system/file_system.dart';
-import 'package:dartdoc/src/dartdoc_options.dart';
 import 'package:dartdoc/src/element_type.dart';
-import 'package:dartdoc/src/failure.dart';
-import 'package:dartdoc/src/generator/resource_loader.dart';
 import 'package:dartdoc/src/generator/template_data.dart';
 import 'package:dartdoc/src/generator/templates.aot_renderers_for_html.dart'
     as aot_renderers_for_html;
@@ -115,23 +111,6 @@ abstract class Templates {
   String renderSidebarForLibrary(TemplateDataWithLibrary<Documentable> context);
   String renderTopLevelProperty(TopLevelPropertyTemplateData context);
   String renderTypedef(TypedefTemplateData context);
-
-  /// Creates a [Templates] instance from the default set of templates.
-  ///
-  /// [forceRuntimeTemplates] should only be given `true` during tests.
-  static Future<Templates> fromContext(DartdocGeneratorOptionContext context,
-      // TODO(srawlins): Remove this option, as runtime templates are no longer
-      // supported.
-      {bool forceRuntimeTemplates = false}) async {
-    if (forceRuntimeTemplates) {
-      var directory = await context.resourceProvider
-          .getResourceFolder('package:dartdoc/templates');
-      return RuntimeTemplates._create(directory,
-          resourceProvider: context.resourceProvider);
-    } else {
-      return HtmlAotTemplates();
-    }
-  }
 }
 
 /// The [Templates] implementation which uses the render functions generated
@@ -221,6 +200,8 @@ class HtmlAotTemplates implements Templates {
 }
 
 /// The collection of [Template] objects parsed at runtime.
+// TODO(srawlins): Remove this class, and `templates.runtime_renderers.dart`, as
+// runtime templates are no longer supported.
 class RuntimeTemplates implements Templates {
   @override
   String renderCategory(CategoryTemplateData context) =>
@@ -325,59 +306,6 @@ class RuntimeTemplates implements Templates {
   final Template _topLevelPropertyTemplate;
   final Template _typedefTemplate;
 
-  /// Creates a [Templates] from a custom set of template files, found in [dir].
-  static Future<Templates> _create(Folder dir,
-      {required ResourceProvider resourceProvider}) async {
-    Future<Template> loadTemplate(String templatePath) {
-      var templateFile = dir.getChildAssumingFile('$templatePath.html');
-      if (!templateFile.exists) {
-        throw DartdocFailure(
-            'Missing required template file: $templatePath.html');
-      }
-      return Template.parse(templateFile,
-          partialResolver: (String partialName) async =>
-              dir.getChildAssumingFile('_$partialName.html'));
-    }
-
-    var indexTemplate = await loadTemplate('index');
-    var libraryTemplate = await loadTemplate('library');
-    var searchPageTemplate = await loadTemplate('search');
-    var sidebarContainerTemplate = await loadTemplate('_sidebar_for_container');
-    var sidebarLibraryTemplate = await loadTemplate('_sidebar_for_library');
-    var categoryTemplate = await loadTemplate('category');
-    var classTemplate = await loadTemplate('class');
-    var constructorTemplate = await loadTemplate('constructor');
-    var enumTemplate = await loadTemplate('enum');
-    var errorTemplate = await loadTemplate('404error');
-    var extensionTemplate = await loadTemplate('extension');
-    var functionTemplate = await loadTemplate('function');
-    var methodTemplate = await loadTemplate('method');
-    var mixinTemplate = await loadTemplate('mixin');
-    var propertyTemplate = await loadTemplate('property');
-    var topLevelPropertyTemplate = await loadTemplate('top_level_property');
-    var typeDefTemplate = await loadTemplate('typedef');
-
-    return RuntimeTemplates._(
-      categoryTemplate,
-      libraryTemplate,
-      classTemplate,
-      constructorTemplate,
-      enumTemplate,
-      errorTemplate,
-      extensionTemplate,
-      functionTemplate,
-      indexTemplate,
-      methodTemplate,
-      mixinTemplate,
-      propertyTemplate,
-      searchPageTemplate,
-      sidebarContainerTemplate,
-      sidebarLibraryTemplate,
-      topLevelPropertyTemplate,
-      typeDefTemplate,
-    );
-  }
-
   RuntimeTemplates._(
     this._categoryTemplate,
     this._libraryTemplate,
diff --git a/test/dartdoc_test_base.dart b/test/dartdoc_test_base.dart
index 238571e893..be046a1569 100644
--- a/test/dartdoc_test_base.dart
+++ b/test/dartdoc_test_base.dart
@@ -131,15 +131,15 @@ $libraryContent
         .named(libraryName);
   }
 
-  Future<Dartdoc> buildDartdoc({
+  Dartdoc buildDartdoc({
     List<String> excludeLibraries = const [],
     List<String> additionalArguments = const [],
     bool skipUnreachableSdkLibraries = true,
     bool useJson = false,
-  }) async {
+  }) {
     final dir = resourceProvider.getFolder(resourceProvider.pathContext
         .absolute(resourceProvider.pathContext.normalize(packagePath)));
-    final context = await generatorContextFromArgv([
+    final context = generatorContextFromArgv([
       '--input',
       dir.path,
       '--output',
@@ -165,7 +165,7 @@ $libraryContent
       outSink: outBuffer,
       errSink: errBuffer,
     );
-    return await Dartdoc.fromContext(context, packageBuilder);
+    return Dartdoc.fromContext(context, packageBuilder);
   }
 
   /// The real offset in a library generated with [bootPackageWithLibrary].
diff --git a/test/end2end/dartdoc_test.dart b/test/end2end/dartdoc_test.dart
index 3e149241e7..1ec3cf0667 100644
--- a/test/end2end/dartdoc_test.dart
+++ b/test/end2end/dartdoc_test.dart
@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'dart:async';
-
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:dartdoc/src/dartdoc.dart' show Dartdoc, DartdocResults;
 import 'package:dartdoc/src/dartdoc_options.dart';
@@ -63,13 +61,13 @@ void main() {
       tempDir.delete();
     });
 
-    Future<Dartdoc> buildDartdoc(
-        List<String> argv, Folder packageRoot, Folder tempDir) async {
-      var context = await generatorContextFromArgv(
+    Dartdoc buildDartdoc(
+        List<String> argv, Folder packageRoot, Folder tempDir) {
+      var context = generatorContextFromArgv(
           [...argv, '--input', packageRoot.path, '--output', tempDir.path],
           pubPackageMetaProvider);
 
-      return await Dartdoc.fromContext(
+      return Dartdoc.fromContext(
         context,
         PubPackageBuilder(
             context, pubPackageMetaProvider, PhysicalPackageConfigProvider(),
@@ -79,7 +77,7 @@ void main() {
 
     test('errors generate errors even when warnings are off', () async {
       var dartdoc =
-          await buildDartdoc(['--allow-tools'], testPackageToolError, tempDir);
+          buildDartdoc(['--allow-tools'], testPackageToolError, tempDir);
       var results = await dartdoc.generateDocsBase();
       var p = results.packageGraph;
       var unresolvedToolErrors = p.packageWarningCounter.countedWarnings.values
@@ -93,8 +91,8 @@ void main() {
     });
 
     test('basic interlinking test', () async {
-      var dartdoc = await buildDartdoc(
-          ['--exclude-packages=args'], _testPackageDir, tempDir);
+      var dartdoc =
+          buildDartdoc(['--exclude-packages=args'], _testPackageDir, tempDir);
       var results = await dartdoc.generateDocs();
       var p = results.packageGraph;
       var meta = p.publicPackages.firstWhere((p) => p.name == 'meta');
@@ -123,7 +121,7 @@ void main() {
 
       setUpAll(() async {
         tempDir = _resourceProvider.createSystemTemp('dartdoc.test.');
-        var dartdoc = await buildDartdoc([], _testPackageDir, tempDir);
+        var dartdoc = buildDartdoc([], _testPackageDir, tempDir);
         results = await dartdoc.generateDocs();
       });
 
@@ -145,7 +143,7 @@ void main() {
     test('generate docs for ${path.basename(_testPackageBadDir.path)} fails',
         skip: 'Blocked on getting analysis errors with correct interpretation '
             'from analysis_options', () async {
-      var dartdoc = await buildDartdoc([], _testPackageBadDir, tempDir);
+      var dartdoc = buildDartdoc([], _testPackageBadDir, tempDir);
 
       try {
         await dartdoc.generateDocs();
@@ -156,7 +154,7 @@ void main() {
     });
 
     test('generate docs for package with embedder yaml', () async {
-      var dartdoc = await buildDartdoc([], _testSkyEnginePackage, tempDir);
+      var dartdoc = buildDartdoc([], _testSkyEnginePackage, tempDir);
 
       var results = await dartdoc.generateDocs();
       expect(results.packageGraph, isNotNull);
@@ -188,7 +186,7 @@ void main() {
 
     test('rel canonical prefix does not include base href', () async {
       final prefix = 'foo.bar/baz';
-      var dartdoc = await buildDartdoc(
+      var dartdoc = buildDartdoc(
           ['--rel-canonical-prefix', prefix], _testPackageDir, tempDir);
       await dartdoc.generateDocsBase();
 
diff --git a/test/mustachio/renderers_output_test.dart b/test/mustachio/renderers_output_test.dart
deleted file mode 100644
index cc5be6a3c0..0000000000
--- a/test/mustachio/renderers_output_test.dart
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright (c) 2021, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import 'dart:async';
-import 'dart:io';
-
-import 'package:analyzer/file_system/file_system.dart';
-import 'package:analyzer/file_system/memory_file_system.dart';
-import 'package:dartdoc/src/dartdoc.dart' show Dartdoc, DartdocFileWriter;
-import 'package:dartdoc/src/dartdoc_options.dart';
-import 'package:dartdoc/src/generator/generator.dart';
-import 'package:dartdoc/src/generator/html_generator.dart';
-import 'package:dartdoc/src/io_utils.dart';
-import 'package:dartdoc/src/model/package_builder.dart';
-import 'package:dartdoc/src/package_config_provider.dart';
-import 'package:dartdoc/src/package_meta.dart';
-import 'package:test/test.dart';
-
-/// Convenience factory to build a [DartdocGeneratorOptionContext] and associate
-/// it with a [DartdocOptionSet] based on the current working directory and/or
-/// the '--input' flag.
-Future<DartdocGeneratorOptionContext> _generatorContextFromArgv(
-    List<String> argv) async {
-  var optionSet = DartdocOptionRoot.fromOptionGenerators(
-    'dartdoc',
-    [
-      createDartdocOptions,
-      createGeneratorOptions,
-    ],
-    pubPackageMetaProvider,
-  );
-  optionSet.parseArguments(argv);
-  return DartdocGeneratorOptionContext.fromDefaultContextLocation(
-      optionSet, pubPackageMetaProvider.resourceProvider);
-}
-
-void main() {
-  late Directory tempDir;
-
-  setUp(() {
-    tempDir = Directory.systemTemp.createTempSync('render_test');
-  });
-
-  tearDown(() => tempDir.deleteSync(recursive: true));
-
-  test('source code links are visible', () async {
-    var resourceProvider = pubPackageMetaProvider.resourceProvider;
-    var pathContext = resourceProvider.pathContext;
-    var testPackageDir = resourceProvider.getFolder(
-        pathContext.absolute(pathContext.canonicalize('testing/test_package')));
-
-    var context = await _generatorContextFromArgv(
-        ['--input', testPackageDir.path, '--output', tempDir.path]);
-    var dartdoc = await Dartdoc.fromContext(
-      context,
-      PubPackageBuilder(
-          context, pubPackageMetaProvider, PhysicalPackageConfigProvider(),
-          skipUnreachableSdkLibraries: true),
-    );
-
-    var packageGraph = await dartdoc.packageBuilder.buildPackageGraph();
-    var reourceProviderForWriting = MemoryResourceProvider();
-
-    var tempDirForAot = reourceProviderForWriting.createSystemTemp('aot.');
-    if (!tempDirForAot.exists) tempDirForAot.create();
-    var writerForAot =
-        DartdocFileWriter(tempDirForAot.path, reourceProviderForWriting);
-    dartdoc.generator = await initHtmlGenerator(context,
-        writer: writerForAot, forceRuntimeTemplates: true);
-    await dartdoc.generator.generate(packageGraph);
-
-    var tempDirForRuntime =
-        reourceProviderForWriting.createSystemTemp('runtime.');
-    if (!tempDirForRuntime.exists) tempDirForRuntime.create();
-    var writerForRuntime =
-        DartdocFileWriter(tempDirForRuntime.path, reourceProviderForWriting);
-    dartdoc.generator = await initHtmlGenerator(context,
-        writer: writerForRuntime, forceRuntimeTemplates: true);
-    await dartdoc.generator.generate(packageGraph);
-
-    var filesInAot = 0;
-    var filesInRuntime = 0;
-    var charactersInAot = 0;
-    var charactersInRuntime = 0;
-
-    void checkDirectories(Folder aotDirectory, Folder runtimeDirectory) {
-      expect(aotDirectory.exists, true);
-      expect(runtimeDirectory.exists, true);
-      for (var aotResource in aotDirectory.getChildren()) {
-        var runtimeResource = runtimeDirectory.getChild(aotResource.shortName);
-        expect(runtimeResource.exists, true);
-        if (aotResource is Folder) {
-          if (aotResource.shortName == '.') continue;
-          if (aotResource.shortName == '..') continue;
-          if (aotResource.shortName == 'static-assets') continue;
-          checkDirectories(aotResource, runtimeResource as Folder);
-        } else if (aotResource is File) {
-          expect(runtimeResource is File, true);
-          var contentInAot = aotResource.readAsStringSync();
-          var contentInRuntime = (runtimeResource as File).readAsStringSync();
-          expect(contentInAot, equals(contentInRuntime));
-          filesInAot++;
-          filesInRuntime++;
-          charactersInAot += contentInAot.length;
-          charactersInRuntime += contentInRuntime.length;
-        }
-      }
-    }
-
-    checkDirectories(tempDirForAot, tempDirForRuntime);
-
-    print('Checked $filesInAot files in AOT-rendered HTML against '
-        '$filesInRuntime files in runtime-rendered HTML');
-    print('Checked $charactersInAot characters in AOT-rendered HTML against '
-        '$charactersInRuntime characters in runtime-rendered HTML');
-  }, timeout: Timeout.factor(2));
-}
diff --git a/test/options_test.dart b/test/options_test.dart
index 525672679e..77158fac18 100644
--- a/test/options_test.dart
+++ b/test/options_test.dart
@@ -55,12 +55,9 @@ dartdoc:
       libFiles: [d.file('lib.dart', '')],
       files: [d.file('anicon.png', 'Just plain text')],
     );
-    await (await buildDartdoc(
-      additionalArguments: [
-        '--auto-include-dependencies',
-      ],
-    ))
-        .generateDocs();
+    await buildDartdoc(
+      additionalArguments: ['--auto-include-dependencies'],
+    ).generateDocs();
 
     final faviconContent = resourceProvider
         .getFile(
@@ -80,7 +77,7 @@ dartdoc:
         d.dir('extras', [d.file('header.html', '<em>Header</em> things.')])
       ],
     );
-    await (await buildDartdoc()).generateDocs();
+    await buildDartdoc().generateDocs();
 
     final indexContent = resourceProvider
         .getFile(path.joinAll([packagePath, 'doc', 'index.html']))
@@ -99,7 +96,7 @@ dartdoc:
         d.dir('extras', [d.file('footer.html', '<em>Footer</em> things.')])
       ],
     );
-    await (await buildDartdoc()).generateDocs();
+    await buildDartdoc().generateDocs();
 
     final indexContent = resourceProvider
         .getFile(path.joinAll([packagePath, 'doc', 'index.html']))
@@ -118,7 +115,7 @@ dartdoc:
         d.dir('extras', [d.file('footer.txt', 'Just footer text')])
       ],
     );
-    await (await buildDartdoc()).generateDocs();
+    await buildDartdoc().generateDocs();
 
     final indexContent = resourceProvider
         .getFile(path.joinAll([packagePath, 'doc', 'index.html']))
@@ -137,7 +134,7 @@ dartdoc:
         d.dir('extras', [d.file('footer.txt', 'Just footer text')])
       ],
     );
-    await (await buildDartdoc()).generateDocs();
+    await buildDartdoc().generateDocs();
 
     final indexContent = resourceProvider
         .getFile(path.joinAll([packagePath, 'doc', 'index.html']))
@@ -440,7 +437,7 @@ class C1 {}
 
   void test_emptyPackage() async {
     await createPackage();
-    await (await buildDartdoc()).generateDocs();
+    await buildDartdoc().generateDocs();
 
     expect(outBuffer, isEmpty);
     expect(
@@ -478,7 +475,7 @@ class Foo {}
 '''),
       ],
     );
-    final dartdoc = await buildDartdoc(additionalArguments: [
+    final dartdoc = buildDartdoc(additionalArguments: [
       '--quiet',
     ]);
     await dartdoc.generateDocs();
@@ -502,7 +499,7 @@ class Foo {}
 '''),
       ],
     );
-    final dartdoc = await buildDartdoc(additionalArguments: [
+    final dartdoc = buildDartdoc(additionalArguments: [
       '--no-generate-docs',
     ]);
     await dartdoc.generateDocs();
@@ -532,7 +529,7 @@ class Foo {}
       ],
     );
     await writeDartdocResources(resourceProvider);
-    final dartdoc = await buildDartdoc(useJson: true);
+    final dartdoc = buildDartdoc(useJson: true);
     await dartdoc.generateDocs();
 
     expect(
@@ -584,7 +581,7 @@ class Foo {
       ],
     );
     final dartdoc =
-        await buildDartdoc(additionalArguments: ['--max-file-count', '2']);
+        buildDartdoc(additionalArguments: ['--max-file-count', '2']);
     await expectLater(
         dartdoc.generateDocs,
         throwsA(const TypeMatcher<DartdocFailure>().having((f) => f.message,
@@ -604,7 +601,7 @@ class Foo {
       ],
     );
     final dartdoc =
-        await buildDartdoc(additionalArguments: ['--max-file-count', '2000']);
+        buildDartdoc(additionalArguments: ['--max-file-count', '2000']);
     await dartdoc.generateDocs();
   }
 
@@ -621,7 +618,7 @@ class Foo {
       ],
     );
     final dartdoc =
-        await buildDartdoc(additionalArguments: ['--max-total-size', '15000']);
+        buildDartdoc(additionalArguments: ['--max-total-size', '15000']);
     await expectLater(
         dartdoc.generateDocs,
         throwsA(const TypeMatcher<DartdocFailure>().having((f) => f.message,
@@ -640,8 +637,8 @@ class Foo {
 '''),
       ],
     );
-    final dartdoc = await buildDartdoc(
-        additionalArguments: ['--max-total-size', '15000000']);
+    final dartdoc =
+        buildDartdoc(additionalArguments: ['--max-total-size', '15000000']);
     await dartdoc.generateDocs();
   }
 
diff --git a/test/resource_loader_test.dart b/test/resource_loader_test.dart
deleted file mode 100644
index e5f8077819..0000000000
--- a/test/resource_loader_test.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import 'package:analyzer/file_system/physical_file_system.dart';
-import 'package:dartdoc/src/generator/resource_loader.dart';
-import 'package:test/test.dart';
-
-void main() {
-  group('Resource Loader', () {
-    var resourceProvider = PhysicalResourceProvider();
-
-    test('load from packages', () async {
-      var contents = await resourceProvider
-          .loadResourceAsString('package:dartdoc/templates/index.html');
-      expect(contents, isNotNull);
-    });
-
-    test('throws if non-package', () async {
-      expect(resourceProvider.loadResourceAsString('wefoij:something'),
-          throwsArgumentError);
-    });
-  });
-}
diff --git a/test/src/utils.dart b/test/src/utils.dart
index d43db63a8b..e6057a5801 100644
--- a/test/src/utils.dart
+++ b/test/src/utils.dart
@@ -53,8 +53,8 @@ Future<DartdocOptionContext> contextFromArgv(
 /// Convenience factory to build a [DartdocGeneratorOptionContext] and
 /// associate it with a [DartdocOptionSet] based on the current working
 /// directory and/or the '--input' flag.
-Future<DartdocGeneratorOptionContext> generatorContextFromArgv(
-    List<String> argv, PackageMetaProvider packageMetaProvider) async {
+DartdocGeneratorOptionContext generatorContextFromArgv(
+    List<String> argv, PackageMetaProvider packageMetaProvider) {
   var optionSet = DartdocOptionRoot.fromOptionGenerators(
     'dartdoc',
     [
diff --git a/test/templates/category_test.dart b/test/templates/category_test.dart
index 54fbe8d3b5..56b2642e60 100644
--- a/test/templates/category_test.dart
+++ b/test/templates/category_test.dart
@@ -4,7 +4,6 @@
 
 import 'package:analyzer/file_system/memory_file_system.dart';
 import 'package:dartdoc/src/dartdoc.dart';
-import 'package:dartdoc/src/dartdoc_options.dart';
 import 'package:dartdoc/src/model/model.dart';
 import 'package:dartdoc/src/package_meta.dart';
 import 'package:path/path.dart' as path;
@@ -19,12 +18,11 @@ void main() async {
   late String packagePath;
   late MemoryResourceProvider resourceProvider;
   late PackageMetaProvider packageMetaProvider;
-  late DartdocGeneratorOptionContext context;
   late List<String> topicOneLines;
   late List<String> indexPageLines;
 
-  Future<PubPackageBuilder> createPackageBuilder() async {
-    context = await utils.generatorContextFromArgv([
+  Dartdoc buildDartdoc() {
+    var context = utils.generatorContextFromArgv([
       '--input',
       packagePath,
       '--output',
@@ -38,20 +36,13 @@ void main() async {
         .getTestPackageConfigProvider(packageMetaProvider.defaultSdkDir.path);
     packageConfigProvider.addPackageToConfigFor(
         packagePath, packageName, Uri.file('$packagePath/'));
-    return PubPackageBuilder(
+    var packageBuilder = PubPackageBuilder(
       context,
       packageMetaProvider,
       packageConfigProvider,
       skipUnreachableSdkLibraries: true,
     );
-  }
-
-  Future<Dartdoc> buildDartdoc() async {
-    final packageBuilder = await createPackageBuilder();
-    return await Dartdoc.fromContext(
-      context,
-      packageBuilder,
-    );
+    return Dartdoc.fromContext(context, packageBuilder);
   }
 
   setUpAll(() async {
@@ -137,7 +128,8 @@ export 'lib.dart' show C1, E1;
       resourceProvider: resourceProvider,
     );
     await utils.writeDartdocResources(resourceProvider);
-    await (await buildDartdoc()).generateDocs();
+    var dartdoc = buildDartdoc();
+    await dartdoc.generateDocs();
     topicOneLines = resourceProvider
         .getFile(path.join(packagePath, 'doc', 'topics', 'cat1-topic.html'))
         .readAsStringSync()
diff --git a/test/templates/enum_test.dart b/test/templates/enum_test.dart
index 7757950541..dd04d11df6 100644
--- a/test/templates/enum_test.dart
+++ b/test/templates/enum_test.dart
@@ -98,7 +98,7 @@ extension Ext<T> on E<T> {}
         resourceProvider: resourceProvider,
       );
       await writeDartdocResources(resourceProvider);
-      final context = await generatorContextFromArgv([
+      final context = generatorContextFromArgv([
         '--input',
         packagePath,
         '--output',
@@ -118,7 +118,7 @@ extension Ext<T> on E<T> {}
         packageConfigProvider,
         skipUnreachableSdkLibraries: true,
       );
-      await (await Dartdoc.fromContext(context, packageBuilder)).generateDocs();
+      await Dartdoc.fromContext(context, packageBuilder).generateDocs();
       eLines = resourceProvider
           .getFile(path.join(packagePath, 'doc', 'lib', 'E.html'))
           .readAsStringSync()
diff --git a/test/templates/extension_test.dart b/test/templates/extension_test.dart
index 36fe9a5d2c..30ec598a4b 100644
--- a/test/templates/extension_test.dart
+++ b/test/templates/extension_test.dart
@@ -4,7 +4,6 @@
 
 import 'package:analyzer/file_system/memory_file_system.dart';
 import 'package:dartdoc/src/dartdoc.dart';
-import 'package:dartdoc/src/dartdoc_options.dart';
 import 'package:dartdoc/src/model/model.dart';
 import 'package:dartdoc/src/package_meta.dart';
 import 'package:path/path.dart' as path;
@@ -19,12 +18,11 @@ void main() async {
   late String packagePath;
   late MemoryResourceProvider resourceProvider;
   late PackageMetaProvider packageMetaProvider;
-  late DartdocGeneratorOptionContext context;
   late List<String> eLines;
   late List<String> eRightSidebarLines;
 
-  Future<PubPackageBuilder> createPackageBuilder() async {
-    context = await generatorContextFromArgv([
+  Dartdoc buildDartdoc() {
+    var context = generatorContextFromArgv([
       '--input',
       packagePath,
       '--output',
@@ -38,17 +36,13 @@ void main() async {
         getTestPackageConfigProvider(packageMetaProvider.defaultSdkDir.path);
     packageConfigProvider.addPackageToConfigFor(
         packagePath, packageName, Uri.file('$packagePath/'));
-    return PubPackageBuilder(
+    var packageBuilder = PubPackageBuilder(
       context,
       packageMetaProvider,
       packageConfigProvider,
       skipUnreachableSdkLibraries: true,
     );
-  }
-
-  Future<Dartdoc> buildDartdoc() async {
-    final packageBuilder = await createPackageBuilder();
-    return await Dartdoc.fromContext(context, packageBuilder);
+    return Dartdoc.fromContext(context, packageBuilder);
   }
 
   group('extensions', () {
@@ -97,7 +91,8 @@ dartdoc:
         resourceProvider: resourceProvider,
       );
       await writeDartdocResources(resourceProvider);
-      await (await buildDartdoc()).generateDocs();
+      var dartdoc = buildDartdoc();
+      await dartdoc.generateDocs();
       eLines = resourceProvider
           .getFile(path.join(packagePath, 'doc', 'lib', 'E.html'))
           .readAsStringSync()
diff --git a/test/templates/template_test_base.dart b/test/templates/template_test_base.dart
index 889ae71ec2..06f33f793f 100644
--- a/test/templates/template_test_base.dart
+++ b/test/templates/template_test_base.dart
@@ -33,7 +33,7 @@ environment:
     packageConfigProvider.addPackageToConfigFor(
         packagePath, packageName, Uri.file('$packagePath/'));
 
-    await (await buildDartdoc()).generateDocs();
+    await buildDartdoc().generateDocs();
   }
 
   List<String> readLines(List<String> filePath) =>