[dart2wasm] Format pkg/dart2wasm after language version was increased

The change in [0] increased the language version of pkg/dart2wasm. That
in return changes how the package is formatted by the autoformatter.

This CL runs now the formatter to re-format the code. Unfortunately this
makes blame lists worse. But not doing it will make us have to disable
auto-formatting before saving files which is very annoying.

[0] https://dart-review.googlesource.com/c/sdk/+/487944

Change-Id: I6953fe0d6a824b2b79a26bbadb0bb977cec70b7a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/490821
Reviewed-by: Slava Egorov <vegorov@google.com>
Commit-Queue: Martin Kustermann <kustermann@google.com>

Author: mkustermann

pkg/dart2wasm/benchmark/filesystem_js.dart

@@ -34,8 +34,9 @@ class WasmCompilerFileSystem extends WasmCompilerFileSystemBase {
       if (isJSShell) {
         return jsshellWrite(path, bytes.toJS);
       }
-      final buffer =
-          (Uint8List(bytes.length)..setRange(0, bytes.length, bytes)).buffer;
+      final buffer = (Uint8List(
+        bytes.length,
+      )..setRange(0, bytes.length, bytes)).buffer;
       if (isD8) {
         return d8Write(path, buffer.toJS);
       }

pkg/dart2wasm/benchmark/self_compile_benchmark.dart

@@ -16,7 +16,7 @@ class _BenchmarkIOManager extends CompilerPhaseInputOutputManager {
   Uint8List? moduleBytes;
 
   _BenchmarkIOManager(this.benchmarkFileSystem, WasmCompilerOptions options)
-      : super(benchmarkFileSystem, options);
+    : super(benchmarkFileSystem, options);
 
   @override
   Future<void> writeWasmModule(Uint8List wasmModule, String moduleName) async {
@@ -46,8 +46,9 @@ Future main(List<String> args) async {
   final options = WasmCompilerOptions(mainUri: main, outputFile: 'out.wasm');
   final ioManager = _BenchmarkIOManager(fileSystem, options);
 
-  options.librariesSpecPath =
-      Uri.file('${fileSystem.sdkRoot}/sdk/lib/libraries.json');
+  options.librariesSpecPath = Uri.file(
+    '${fileSystem.sdkRoot}/sdk/lib/libraries.json',
+  );
 
   await compileBenchmark(options, ioManager);
   print('Dart2WasmSelfCompile(RunTimeRaw): ${sw.elapsed.inMilliseconds} ms.');
@@ -58,8 +59,10 @@ Future main(List<String> args) async {
   }
 }
 
-Future<CodegenResult> compileBenchmark(WasmCompilerOptions options,
-    CompilerPhaseInputOutputManager ioManager) async {
+Future<CodegenResult> compileBenchmark(
+  WasmCompilerOptions options,
+  CompilerPhaseInputOutputManager ioManager,
+) async {
   // Avoid CFE self-detecting whether `stdout`/`stderr` is terminal and supports
   // colors (as we don't have `dart:io` available when we run dart2wasm in a
   // wasm runtime).

pkg/dart2wasm/bin/wasm2wat.dart

@@ -22,8 +22,10 @@ void main(List<String> args) {
   final outputFile = result['output'] as String?;
   final wasmFiles = result.rest;
   if (outputFile != null && wasmFiles.length != 1) {
-    print('Specified --output=$outputFile but number of wasm files is not 1 '
-        '(${wasmFiles.join(' ')})');
+    print(
+      'Specified --output=$outputFile but number of wasm files is not 1 '
+      '(${wasmFiles.join(' ')})',
+    );
     print(argParser.usage);
     exit(1);
   }
@@ -47,10 +49,11 @@ void main(List<String> args) {
   final typeFilters = getFilter('type-name-filter');
   final globalFilters = getFilter('global-name-filter');
   final settings = ModulePrintSettings(
-      functionFilters: functionFilters,
-      typeFilters: typeFilters,
-      globalFilters: globalFilters,
-      printInSortedOrder: sort);
+    functionFilters: functionFilters,
+    typeFilters: typeFilters,
+    globalFilters: globalFilters,
+    printInSortedOrder: sort,
+  );
 
   for (final input in wasmFiles) {
     final wasmBytes = File(input).readAsBytesSync();
@@ -71,31 +74,49 @@ void main(List<String> args) {
 }
 
 final argParser = ArgParser()
-  ..addMultiOption('function-name-filter',
-      abbr: 'f',
-      help: 'Only print function bodies if the function name matches. '
-          'The name filter is interpreted as a Dart `RegExp`.')
-  ..addMultiOption('type-name-filter',
-      abbr: 't',
-      help: 'Only print type constituents if the type name matches. '
-          'The name filter is interpreted as a Dart `RegExp`.')
-  ..addMultiOption('global-name-filter',
-      abbr: 'g',
-      help: 'Only print global initializers if the global name matches. '
-          'The name filter is interpreted as a Dart `RegExp`.')
-  ..addFlag('sort',
-      abbr: 's',
-      help: 'Print functions/types/... in sorted order (sort by name).')
-  ..addFlag('write',
-      abbr: 'w', help: 'Write the resulting wat code to <input.wasm>.wat.')
+  ..addMultiOption(
+    'function-name-filter',
+    abbr: 'f',
+    help:
+        'Only print function bodies if the function name matches. '
+        'The name filter is interpreted as a Dart `RegExp`.',
+  )
+  ..addMultiOption(
+    'type-name-filter',
+    abbr: 't',
+    help:
+        'Only print type constituents if the type name matches. '
+        'The name filter is interpreted as a Dart `RegExp`.',
+  )
+  ..addMultiOption(
+    'global-name-filter',
+    abbr: 'g',
+    help:
+        'Only print global initializers if the global name matches. '
+        'The name filter is interpreted as a Dart `RegExp`.',
+  )
+  ..addFlag(
+    'sort',
+    abbr: 's',
+    help: 'Print functions/types/... in sorted order (sort by name).',
+  )
+  ..addFlag(
+    'write',
+    abbr: 'w',
+    help: 'Write the resulting wat code to <input.wasm>.wat.',
+  )
   ..addFlag('help', abbr: 'h', help: 'Print the help of this tool.')
-  ..addFlag('prefer-multiline',
-      abbr: 'm',
-      help:
-          'Prefer to print global initializers & type definitions as multi line.',
-      defaultsTo: /* wami equivalent is false */ false)
-  ..addOption('output',
-      abbr: 'o',
-      help:
-          'The filepath where the output will be written to (default: stdout). '
-          'The number of input wasm files must be 1 if --output was provided.');
+  ..addFlag(
+    'prefer-multiline',
+    abbr: 'm',
+    help:
+        'Prefer to print global initializers & type definitions as multi line.',
+    defaultsTo: /* wami equivalent is false */ false,
+  )
+  ..addOption(
+    'output',
+    abbr: 'o',
+    help:
+        'The filepath where the output will be written to (default: stdout). '
+        'The number of input wasm files must be 1 if --output was provided.',
+  );