Version 2.15.0-141.0.dev

Merge commit '65184a9ff48f424d65e31591d715f04433728922' into 'dev'

Author: Dart CI

pkg/front_end/analysis_options.yaml

@@ -9,6 +9,7 @@ linter:
     - curly_braces_in_flow_control_structures
     - prefer_adjacent_string_concatenation
     - unawaited_futures
+    - avoid_void_async
     - recursive_getters
     - avoid_empty_else
     - empty_statements

pkg/front_end/test/ast_nodes_has_to_string_test.dart

@@ -10,7 +10,7 @@ import 'package:kernel/class_hierarchy.dart';
 
 import 'incremental_suite.dart' as helper;
 
-void main(List<String> args) async {
+Future<void> main(List<String> args) async {
   exitCode = 1;
   Map<Uri, List<Class>> classMap = {};
   Map<Uri, List<Class>> classMapWithOne = {};

pkg/front_end/test/binary_md_vm_tags_and_version_git_test.dart

@@ -29,7 +29,7 @@ final RegExp tagParser = new RegExp(r"V\((\w*),\s*(\d+)\)");
 // Match stuff like "kNullConstant = 0,"
 final RegExp constantTagParser = new RegExp(r"k(\w*)\s*=\s*(\d+)");
 
-void main() async {
+Future<void> main() async {
   File binaryMd = new File("$repoDir/pkg/kernel/binary.md");
   String binaryMdContent = binaryMd.readAsStringSync();
 

pkg/front_end/test/class_hierarchy/class_hierarchy_test.dart

@@ -13,7 +13,7 @@ import 'package:front_end/src/testing/id_extractor.dart';
 import 'package:kernel/ast.dart';
 import 'package:kernel/core_types.dart';
 
-void main(List<String> args) async {
+Future<void> main(List<String> args) async {
   Directory dataDir = new Directory.fromUri(Platform.script.resolve('data'));
   await runTests<Features>(dataDir,
       args: args,

pkg/front_end/test/compile_benchmark_helper.dart

@@ -4,7 +4,7 @@
 
 import '../tool/_fasta/entry_points.dart' show compileEntryPoint;
 
-void main(List<String> arguments) async {
+Future<void> main(List<String> arguments) async {
   await compileEntryPoint(arguments);
   if (numCalls.isNotEmpty) {
     print("[");

pkg/front_end/test/compile_dart2js_with_no_sdk_test.dart

@@ -6,7 +6,7 @@ import 'package:front_end/src/api_prototype/compiler_options.dart';
 
 import 'incremental_suite.dart' show TestIncrementalCompiler, getOptions;
 
-void main() async {
+Future<void> main() async {
   final Uri dart2jsUrl = Uri.base.resolve("pkg/compiler/bin/dart2js.dart");
   CompilerOptions options = getOptions();
   options.sdkSummary = options.sdkSummary!.resolve("nonexisting.dill");

pkg/front_end/test/compile_with_no_sdk_test.dart

@@ -7,7 +7,7 @@ import 'package:front_end/src/api_prototype/memory_file_system.dart';
 
 import 'incremental_suite.dart' show TestIncrementalCompiler, getOptions;
 
-void main() async {
+Future<void> main() async {
   await compile("import 'foo.dart' if (dart.library.bar) 'baz.dart';");
 }
 

pkg/front_end/test/constant_evaluator_benchmark.dart

@@ -131,7 +131,7 @@ class SilentErrorReporter implements constants.ErrorReporter {
 
 late IncrementalCompiler incrementalCompiler;
 
-void main(List<String> arguments) async {
+Future<void> main(List<String> arguments) async {
   Uri? platformUri;
   Uri mainUri;
   bool nnbd = false;

pkg/front_end/test/covariance_check/covariance_check_test.dart

@@ -11,7 +11,7 @@ import 'package:front_end/src/testing/id_testing_helper.dart';
 import 'package:front_end/src/testing/id_testing_utils.dart';
 import 'package:kernel/ast.dart';
 
-void main(List<String> args) async {
+Future<void> main(List<String> args) async {
   Directory dataDir = new Directory.fromUri(Platform.script.resolve('data'));
   await runTests<String>(dataDir,
       args: args,

pkg/front_end/test/crashing_test_case_minimizer.dart

@@ -19,7 +19,7 @@ import 'crashing_test_case_minimizer_impl.dart';
 // TODO(jensj): Add asserts or similar where - after each rewrite - we run the
 // parser on it and verifies that no syntax errors have been introduced.
 
-void main(List<String> arguments) async {
+Future<void> main(List<String> arguments) async {
   String filename;
   Uri loadJson;
   for (String arg in arguments) {

pkg/front_end/test/dartdoc_test_test.dart

@@ -9,7 +9,7 @@ import 'package:front_end/src/fasta/hybrid_file_system.dart';
 
 import "../tool/dart_doctest_impl.dart" as impl;
 
-void main() async {
+Future<void> main() async {
   expectCategory = "comment extraction";
   testCommentExtraction();
 
@@ -20,7 +20,7 @@ void main() async {
   await testRunningTests();
 }
 
-void testRunningTests() async {
+Future<void> testRunningTests() async {
   MemoryFileSystem memoryFileSystem =
       new MemoryFileSystem(new Uri(scheme: "darttest", path: "/"));
   HybridFileSystem hybridFileSystem = new HybridFileSystem(memoryFileSystem);

pkg/front_end/test/desugar_test.dart

@@ -23,7 +23,7 @@ import 'package:front_end/src/testing/compiler_common.dart';
 import 'package:kernel/ast.dart' as ir;
 import 'package:kernel/binary/ast_from_binary.dart' show BinaryBuilder;
 
-void main() async {
+Future<void> main() async {
   await asyncTest(() async {
     await testRedirectingFactoryDirect();
     await testRedirectingFactorySerialized();

pkg/front_end/test/dill_round_trip_test.dart

@@ -15,7 +15,7 @@ import 'package:kernel/target/targets.dart' show NoneTarget, TargetFlags;
 import 'incremental_suite.dart'
     show checkIsEqual, getOptions, normalCompilePlain;
 
-void main() async {
+Future<void> main() async {
   final Uri dart2jsUrl = Uri.base.resolve("pkg/compiler/bin/dart2js.dart");
   Stopwatch stopwatch = new Stopwatch()..start();
   Component compiledComponent = await normalCompilePlain(dart2jsUrl,

pkg/front_end/test/enable_non_nullable/enable_non_nullable_test.dart

@@ -20,7 +20,7 @@ const Version experimentReleaseVersion = const Version(2, 9);
 /// The version used in this test as the experiment enabled version.
 const Version experimentEnabledVersion = const Version(2, 10);
 
-void main() async {
+Future<void> main() async {
   print('--------------------------------------------------------------------');
   print('Test off-by-default with command-line flag');
   print('--------------------------------------------------------------------');
@@ -58,7 +58,7 @@ void main() async {
       versionOptsInAllowed: experimentReleaseVersion);
 }
 
-void test(
+Future<void> test(
     {bool enableNonNullableByDefault,
     bool enableNonNullableExplicitly,
     Version versionImpliesOptIn,

pkg/front_end/test/extensions/extensions_test.dart

@@ -23,7 +23,7 @@ import 'package:front_end/src/testing/id_testing_helper.dart';
 import 'package:front_end/src/testing/id_testing_utils.dart';
 import 'package:kernel/ast.dart';
 
-void main(List<String> args) async {
+Future<void> main(List<String> args) async {
   Directory dataDir = new Directory.fromUri(Platform.script.resolve('data'));
   await runTests<Features>(dataDir,
       args: args,

pkg/front_end/test/fasta/ambiguous_export_test.dart

@@ -20,7 +20,7 @@ import 'package:front_end/src/fasta/dill/dill_target.dart' show DillTarget;
 import 'package:kernel/ast.dart'
     show Field, Library, Name, Component, StringLiteral;
 
-void main() async {
+Future<void> main() async {
   await asyncTest(() async {
     Uri uri = Uri.parse("org.dartlang.fasta:library");
     Library library = new Library(uri, fileUri: uri);

pkg/front_end/test/fasta/analyze_git_test.dart

@@ -8,7 +8,7 @@ import 'dart:io' show exitCode;
 
 import "package:testing/src/run_tests.dart" as testing show main;
 
-void main() async {
+Future<void> main() async {
   // This method is async, but keeps a port open to prevent the VM from exiting
   // prematurely.
   // Note: if you change this file, also change

pkg/front_end/test/fasta/analyze_src_with_lints_git_test.dart

@@ -8,7 +8,7 @@ import 'dart:io' show exitCode;
 
 import "package:testing/src/run_tests.dart" as testing show main;
 
-void main() async {
+Future<void> main() async {
   await testing.main(<String>[
     "--config=pkg/front_end/testing_with_lints.json",
     "--verbose",

pkg/front_end/test/fasta/expression_suite.dart

@@ -327,7 +327,7 @@ class CompileExpression extends Step<List<TestCase>, List<TestCase>, Context> {
 
   // Compile [test.expression], update [test.errors] with results.
   // As a side effect - verify that generated procedure can be serialized.
-  void compileExpression(TestCase test, IncrementalCompiler compiler,
+  Future<void> compileExpression(TestCase test, IncrementalCompiler compiler,
       Component component, Context context) async {
     Map<String, DartType> definitions = {};
     for (String name in test.definitions) {
@@ -386,7 +386,7 @@ class CompileExpression extends Step<List<TestCase>, List<TestCase>, Context> {
         context.fileSystem.entityForUri(dillFileUri).writeAsBytesSync(
             await new File.fromUri(dillFileUri).readAsBytes());
       }
-      compileExpression(test, sourceCompiler, component, context);
+      await compileExpression(test, sourceCompiler, component, context);
 
       var dillCompiler =
           new IncrementalCompiler(context.compilerContext, dillFileUri);
@@ -399,7 +399,7 @@ class CompileExpression extends Step<List<TestCase>, List<TestCase>, Context> {
       // Since it compiled successfully from source, the bootstrap-from-Dill
       // should also succeed without errors.
       assert(errors.isEmpty);
-      compileExpression(test, dillCompiler, component, context);
+      await compileExpression(test, dillCompiler, component, context);
     }
     return new Result.pass(tests);
   }

pkg/front_end/test/fasta/generator_to_string_test.dart

@@ -65,7 +65,7 @@ void check(String expected, Object generator) {
   Expect.stringEquals(expected, "$generator");
 }
 
-void main() async {
+Future<void> main() async {
   await CompilerContext.runWithDefaultOptions((CompilerContext c) async {
     Token token = scanString("    myToken").tokens;
     Uri uri = Uri.parse("org-dartlang-test:my_library.dart");

pkg/front_end/test/fasta/object_supertype_test.dart

@@ -80,7 +80,7 @@ Future<void> test() async {
       .map((DiagnosticMessage message) => getMessageCodeObject(message).name)
       .toSet();
 
-  void check(String objectHeader, List<Code> expectedCodes) async {
+  Future<void> check(String objectHeader, List<Code> expectedCodes) async {
     List<DiagnosticMessage> messages = (await outline(objectHeader))
         .where((DiagnosticMessage message) =>
             !normalErrors.contains(getMessageCodeObject(message).name))

pkg/front_end/test/fasta/type_inference/factor_type_test.dart

@@ -102,7 +102,7 @@ class FactorTypeTest extends FactorTypeTestMixin<DartType> {
       typeToText(type, TypeRepresentation.analyzerNonNullableByDefault);
 }
 
-void main() async {
+Future<void> main() async {
   CompilerOptions options = new CompilerOptions()
     ..explicitExperimentalFlags[ExperimentalFlag.nonNullable] = true;
   InternalCompilerResult result = await compileScript('',

pkg/front_end/test/flutter_gallery_leak_tester.dart

@@ -26,7 +26,7 @@ Set<String> files = {};
 // but assumes that flutter has been setup as by the script
 // `tools/bots/flutter/compile_flutter.sh`.
 
-void main(List<String> args) async {
+Future<void> main(List<String> args) async {
   if (Platform.isWindows) {
     throw "This script cannot run on Windows as it uses non-Windows "
         "assumptions both for the placement of pub packages and the presence "

pkg/front_end/test/generated_files_up_to_date_git_test.dart

@@ -20,7 +20,7 @@ import 'utils/io_utils.dart' show computeRepoDirUri;
 
 final Uri repoDir = computeRepoDirUri();
 
-void main() async {
+Future<void> main() async {
   messages();
   experimentalFlags();
   directParserAstHelper();

pkg/front_end/test/id_testing/id_testing_test.dart

@@ -29,7 +29,7 @@ import 'package:kernel/ast.dart'
         Library,
         TreeNode;
 
-void main(List<String> args) async {
+Future<void> main(List<String> args) async {
   Directory dataDir = new Directory.fromUri(Platform.script.resolve('data'));
   await runTests<String>(dataDir,
       args: args,

pkg/front_end/test/id_tests/assigned_variables_test.dart

@@ -18,7 +18,7 @@ import 'package:front_end/src/testing/id_testing_helper.dart';
 import 'package:front_end/src/testing/id_testing_utils.dart';
 import 'package:kernel/ast.dart' hide Variance;
 
-void main(List<String> args) async {
+Future<void> main(List<String> args) async {
   Directory dataDir = new Directory.fromUri(Platform.script.resolve(
       '../../../_fe_analyzer_shared/test/flow_analysis/assigned_variables/'
       'data'));

pkg/front_end/test/id_tests/constant_test.dart

@@ -22,7 +22,7 @@ import 'package:front_end/src/testing/id_testing_helper.dart'
 import 'package:front_end/src/testing/id_testing_utils.dart';
 import 'package:kernel/ast.dart';
 
-void main(List<String> args) async {
+Future<void> main(List<String> args) async {
   Directory dataDir = new Directory.fromUri(Platform.script
       .resolve('../../../_fe_analyzer_shared/test/constants/data'));
   await runTests<String>(dataDir,

pkg/front_end/test/id_tests/definite_assignment_test.dart

@@ -14,7 +14,7 @@ import 'package:front_end/src/fasta/type_inference/type_inference_engine.dart';
 import 'package:front_end/src/testing/id_testing_utils.dart';
 import 'package:kernel/ast.dart' hide Variance;
 
-void main(List<String> args) async {
+Future<void> main(List<String> args) async {
   Directory dataDir = new Directory.fromUri(Platform.script.resolve(
       '../../../_fe_analyzer_shared/test/flow_analysis/definite_assignment/'
       'data'));

pkg/front_end/test/id_tests/definite_unassignment_test.dart

@@ -14,7 +14,7 @@ import 'package:front_end/src/fasta/type_inference/type_inference_engine.dart';
 import 'package:front_end/src/testing/id_testing_utils.dart';
 import 'package:kernel/ast.dart' hide Variance;
 
-void main(List<String> args) async {
+Future<void> main(List<String> args) async {
   Directory dataDir = new Directory.fromUri(Platform.script.resolve(
       '../../../_fe_analyzer_shared/test/flow_analysis/definite_unassignment/'
       'data'));

pkg/front_end/test/id_tests/inferred_type_arguments_test.dart

@@ -14,7 +14,7 @@ import 'package:front_end/src/testing/id_testing_helper.dart';
 import 'package:front_end/src/testing/id_testing_utils.dart';
 import 'package:kernel/ast.dart' hide Variance;
 
-void main(List<String> args) async {
+Future<void> main(List<String> args) async {
   Directory dataDir = new Directory.fromUri(
       Platform.script.resolve('../../../_fe_analyzer_shared/test/'
           'inference/inferred_type_arguments/data'));

pkg/front_end/test/id_tests/inferred_variable_types_test.dart

@@ -14,7 +14,7 @@ import 'package:front_end/src/testing/id_testing_helper.dart';
 import 'package:front_end/src/testing/id_testing_utils.dart';
 import 'package:kernel/ast.dart' hide Variance;
 
-void main(List<String> args) async {
+Future<void> main(List<String> args) async {
   Directory dataDir = new Directory.fromUri(
       Platform.script.resolve('../../../_fe_analyzer_shared/test/'
           'inference/inferred_variable_types/data'));

pkg/front_end/test/id_tests/inheritance_test.dart

@@ -20,7 +20,7 @@ import 'package:kernel/type_algebra.dart';
 
 const String cfeFromBuilderMarker = 'cfe:builder';
 
-void main(List<String> args) async {
+Future<void> main(List<String> args) async {
   Directory dataDir = new Directory.fromUri(Platform.script
       .resolve('../../../_fe_analyzer_shared/test/inheritance/data'));
   await runTests<String>(dataDir,

pkg/front_end/test/id_tests/nullability_test.dart

@@ -10,7 +10,7 @@ import 'package:_fe_analyzer_shared/src/testing/id_testing.dart';
 import 'package:front_end/src/testing/id_testing_helper.dart';
 import 'package:kernel/ast.dart' hide Variance;
 
-void main(List<String> args) async {
+Future<void> main(List<String> args) async {
   Directory dataDir = new Directory.fromUri(Platform.script.resolve(
       '../../../_fe_analyzer_shared/test/flow_analysis/nullability/data'));
   await runTests<String>(dataDir,

pkg/front_end/test/id_tests/reachability_test.dart

@@ -15,7 +15,7 @@ import 'package:front_end/src/fasta/type_inference/type_inference_engine.dart';
 import 'package:front_end/src/testing/id_testing_utils.dart';
 import 'package:kernel/ast.dart' hide Variance;
 
-void main(List<String> args) async {
+Future<void> main(List<String> args) async {
   Directory dataDir = new Directory.fromUri(Platform.script.resolve(
       '../../../_fe_analyzer_shared/test/flow_analysis/reachability/data'));
   await runTests<Set<_ReachabilityAssertion>>(dataDir,

pkg/front_end/test/id_tests/type_promotion_test.dart

@@ -12,7 +12,7 @@ import 'package:front_end/src/testing/id_testing_helper.dart';
 import 'package:front_end/src/testing/id_testing_utils.dart';
 import 'package:kernel/ast.dart' hide Variance;
 
-void main(List<String> args) async {
+Future<void> main(List<String> args) async {
   Directory dataDir = new Directory.fromUri(Platform.script
       .resolve('../../../_fe_analyzer_shared/test/flow_analysis/type_promotion/'
           'data'));

pkg/front_end/test/id_tests/why_not_promoted_test.dart

@@ -15,7 +15,7 @@ import 'package:front_end/src/testing/id_testing_helper.dart';
 import 'package:front_end/src/testing/id_testing_utils.dart';
 import 'package:kernel/ast.dart' hide Variance, MapLiteralEntry;
 
-void main(List<String> args) async {
+Future<void> main(List<String> args) async {
   Directory dataDir = new Directory.fromUri(
       Platform.script.resolve('../../../_fe_analyzer_shared/test/flow_analysis/'
           'why_not_promoted/data'));

pkg/front_end/test/incremental_compiler_leak_test.dart

@@ -12,10 +12,10 @@ import "vm_service_helper.dart" as vmService;
 
 const int limit = 10;
 
-void main(List<String> args) async {
+Future<void> main(List<String> args) async {
   LeakFinder heapHelper = new LeakFinder();
 
-  heapHelper.start([
+  await heapHelper.start([
     "--disable-dart-dev",
     "--enable-asserts",
     Platform.script.resolve("incremental_dart2js_tester.dart").toString(),

pkg/front_end/test/incremental_dart2js_load_from_dill_test.dart

@@ -22,7 +22,7 @@ import 'incremental_suite.dart'
 
 Directory outDir;
 
-void main() async {
+Future<void> main() async {
   outDir =
       Directory.systemTemp.createTempSync("incremental_load_from_dill_test");
   try {

pkg/front_end/test/incremental_dart2js_test.dart

@@ -6,7 +6,7 @@
 
 import "incremental_dart2js_tester.dart";
 
-void main(List<String> args) async {
+Future<void> main(List<String> args) async {
   bool fast = true;
   bool useExperimentalInvalidation = true;
   bool addDebugBreaks = false;