use latest format

Author: robbecker-wf

lib/src/core_config.dart

@@ -6,7 +6,7 @@ library dart_dev.src.core_config;
 import 'package:dart_dev/dart_dev.dart';
 
 Map<String, DevTool> get coreConfig => {
-      'analyze': AnalyzeTool(),
-      'format': FormatTool(),
-      'test': TestTool(),
-    };
+  'analyze': AnalyzeTool(),
+  'format': FormatTool(),
+  'test': TestTool(),
+};

lib/src/dart_dev_runner.dart

@@ -11,7 +11,7 @@ import 'utils/version.dart';
 
 class DartDevRunner extends CommandRunner<int> {
   DartDevRunner(Map<String, DevTool> commands)
-      : super('dart_dev', 'Dart tool runner.') {
+    : super('dart_dev', 'Dart tool runner.') {
     // For backwards-compatibility, only add the `clean` command if it doesn't
     // conflict with any configured command.
     if (!commands.containsKey('clean')) {
@@ -79,6 +79,7 @@ class CommandNameMismatch implements Exception {
   CommandNameMismatch(this.actual, this.expected);
 
   @override
-  String toString() => 'CommandNameMismatch: '
+  String toString() =>
+      'CommandNameMismatch: '
       'Expected a "$expected" command but got one named "$actual".';
 }

lib/src/dart_dev_tool.dart

@@ -14,21 +14,19 @@ abstract class DevTool {
   factory DevTool.fromFunction(
     FutureOr<int?> Function(DevToolExecutionContext context) function, {
     ArgParser? argParser,
-  }) =>
-      FunctionTool(function, argParser: argParser);
+  }) => FunctionTool(function, argParser: argParser);
 
   factory DevTool.fromProcess(
     String executable,
     List<String> args, {
     ProcessStartMode? mode,
     String? workingDirectory,
-  }) =>
-      ProcessTool(
-        executable,
-        args,
-        mode: mode,
-        workingDirectory: workingDirectory,
-      );
+  }) => ProcessTool(
+    executable,
+    args,
+    mode: mode,
+    workingDirectory: workingDirectory,
+  );
 
   /// The argument parser for this tool, if needed.
   ///
@@ -122,13 +120,12 @@ class DevToolExecutionContext {
     String? commandName,
     void Function(String message)? usageException,
     bool? verbose,
-  }) =>
-      DevToolExecutionContext(
-        argResults: argResults ?? this.argResults,
-        commandName: commandName ?? this.commandName,
-        usageException: usageException ?? this.usageException,
-        verbose: verbose ?? this.verbose,
-      );
+  }) => DevToolExecutionContext(
+    argResults: argResults ?? this.argResults,
+    commandName: commandName ?? this.commandName,
+    usageException: usageException ?? this.usageException,
+    verbose: verbose ?? this.verbose,
+  );
 
   /// Calling this will throw a [UsageException] with [message] that should be
   /// caught by [CommandRunner] and used to set the exit code accordingly and

lib/src/executable.dart

@@ -62,13 +62,10 @@ Future<void> run(List<String> args) async {
   }
 
   final processArgs = generateRunScript();
-  final process = await Process.start(
-      processArgs.first,
-      [
-        if (processArgs.length > 1) ...processArgs.sublist(1),
-        ...args,
-      ],
-      mode: ProcessStartMode.inheritStdio);
+  final process = await Process.start(processArgs.first, [
+    if (processArgs.length > 1) ...processArgs.sublist(1),
+    ...args,
+  ], mode: ProcessStartMode.inheritStdio);
   ensureProcessExit(process);
   exitCode = await process.exitCode;
 }
@@ -174,13 +171,14 @@ String? _computeRunScriptDigest() {
     if (packageConfig.existsSync()) ...packageConfig.readAsBytesSync(),
     if (configFile.existsSync()) ...configFile.readAsBytesSync(),
     if (configHasRelativeImports)
-      for (final file in Glob('tool/**.dart', recursive: true)
-          .listSync()
-          .whereType<File>()
-          .where(
-            (f) => p.canonicalize(f.path) != p.canonicalize(_paths.config),
-          )
-          .sortedBy((f) => f.path))
+      for (final file
+          in Glob('tool/**.dart', recursive: true)
+              .listSync()
+              .whereType<File>()
+              .where(
+                (f) => p.canonicalize(f.path) != p.canonicalize(_paths.config),
+              )
+              .sortedBy((f) => f.path))
         ...file.readAsBytesSync(),
   ]);
   return base64.encode(digest.bytes);
@@ -328,7 +326,8 @@ Future<void> runWithConfig(
 DevTool chooseDefaultFormatTool({String? path}) {
   final pubspec = cachedPubspec(path: path);
   const orf = 'over_react_format';
-  final hasOverReactFormat = pubspec.dependencies.containsKey(orf) ||
+  final hasOverReactFormat =
+      pubspec.dependencies.containsKey(orf) ||
       pubspec.devDependencies.containsKey(orf) ||
       pubspec.dependencyOverrides.containsKey(orf);
 

lib/src/tools/analyze_tool.dart

@@ -68,7 +68,8 @@ class AnalyzeTool extends DevTool {
   final ArgParser argParser = ArgParser()
     ..addOption(
       'analyzer-args',
-      help: 'Args to pass to the "dartanalyzer" or "dart analyze" process.\n'
+      help:
+          'Args to pass to the "dartanalyzer" or "dart analyze" process.\n'
           'Run "dartanalyzer -h -v" or `dart analyze -h -v" to see all available options.',
     );
 
@@ -82,8 +83,9 @@ class AnalyzeTool extends DevTool {
         context ?? DevToolExecutionContext(),
         configuredAnalyzerArgs: analyzerArgs,
         include: include,
-        useDartAnalyze:
-            !dartVersionHasDartanalyzer ? true : useDartAnalyze ?? false,
+        useDartAnalyze: !dartVersionHasDartanalyzer
+            ? true
+            : useDartAnalyze ?? false,
       ),
       log: _log,
     );
@@ -179,7 +181,8 @@ ProcessDeclaration buildProcess(
       argResults,
       context.usageException,
       commandName: context.commandName,
-      usageFooter: 'Arguments can be passed to the "$analyzerUsed" process via '
+      usageFooter:
+          'Arguments can be passed to the "$analyzerUsed" process via '
           'the --analyzer-args option.',
     );
   }
@@ -197,13 +200,10 @@ ProcessDeclaration buildProcess(
     verbose: context.verbose,
     useDartAnalyzer: useDartAnalyze,
   );
-  return ProcessDeclaration(
-      executable,
-      [
-        ...args,
-        ...entrypoints,
-      ],
-      mode: ProcessStartMode.inheritStdio);
+  return ProcessDeclaration(executable, [
+    ...args,
+    ...entrypoints,
+  ], mode: ProcessStartMode.inheritStdio);
 }
 
 /// Logs the `dartanalyzer` or `dart analyze` command that will be run by [AnalyzeTool] so that

lib/src/tools/compound_tool.dart

@@ -43,9 +43,9 @@ ArgResults takeOptionArgs(ArgParser parser, ArgResults results) =>
 ///         ..addTool(TestTool(), argMapper: takeAllArgs)
 ///     };
 ArgResults takeAllArgs(ArgParser parser, ArgResults results) => parser.parse([
-      ...optionArgsOnly(results, allowedOptions: parser.options.keys),
-      ...restArgsWithSeparator(results),
-    ]);
+  ...optionArgsOnly(results, allowedOptions: parser.options.keys),
+  ...restArgsWithSeparator(results),
+]);
 
 class CompoundTool extends DevTool with CompoundToolMixin {}
 
@@ -81,8 +81,8 @@ mixin CompoundToolMixin on DevTool {
     for (var i = 0; i < _specs.length; i++) {
       if (!shouldRunTool(_specs[i].when, code)) continue;
       final newCode = await _specs[i].tool.run(
-            contextForTool(context, _specs[i]),
-          );
+        contextForTool(context, _specs[i]),
+      );
       _log.fine('Step ${i + 1}/${_specs.length} done (code: $newCode)\n');
       if (code == 0) {
         code = newCode;
@@ -282,19 +282,18 @@ class CompoundArgParser implements ArgParser {
     bool hide = false,
     bool hideNegatedUsage = false,
     List<String> aliases = const [],
-  }) =>
-      _compoundParser.addFlag(
-        name,
-        abbr: abbr,
-        help: help,
-        defaultsTo: defaultsTo,
-        negatable: negatable,
-        // TODO once lower bound of args is 2.7.0 (requires Dart SDK 3.3.0), which adds hideNegatedUsage, forward this arg
-        // hideNegatedUsage: hideNegatedUsage,
-        callback: callback,
-        hide: hide,
-        aliases: aliases,
-      );
+  }) => _compoundParser.addFlag(
+    name,
+    abbr: abbr,
+    help: help,
+    defaultsTo: defaultsTo,
+    negatable: negatable,
+    // TODO once lower bound of args is 2.7.0 (requires Dart SDK 3.3.0), which adds hideNegatedUsage, forward this arg
+    // hideNegatedUsage: hideNegatedUsage,
+    callback: callback,
+    hide: hide,
+    aliases: aliases,
+  );
 
   @override
   void addMultiOption(
@@ -309,20 +308,19 @@ class CompoundArgParser implements ArgParser {
     bool splitCommas = true,
     bool hide = false,
     List<String> aliases = const [],
-  }) =>
-      _compoundParser.addMultiOption(
-        name,
-        abbr: abbr,
-        help: help,
-        valueHelp: valueHelp,
-        allowed: allowed,
-        allowedHelp: allowedHelp,
-        defaultsTo: defaultsTo,
-        callback: callback,
-        splitCommas: splitCommas,
-        hide: hide,
-        aliases: aliases,
-      );
+  }) => _compoundParser.addMultiOption(
+    name,
+    abbr: abbr,
+    help: help,
+    valueHelp: valueHelp,
+    allowed: allowed,
+    allowedHelp: allowedHelp,
+    defaultsTo: defaultsTo,
+    callback: callback,
+    splitCommas: splitCommas,
+    hide: hide,
+    aliases: aliases,
+  );
 
   @override
   void addOption(
@@ -337,18 +335,17 @@ class CompoundArgParser implements ArgParser {
     bool mandatory = false,
     bool hide = false,
     List<String> aliases = const [],
-  }) =>
-      _compoundParser.addOption(
-        name,
-        abbr: abbr,
-        help: help,
-        valueHelp: valueHelp,
-        allowed: allowed,
-        allowedHelp: allowedHelp,
-        defaultsTo: defaultsTo,
-        callback: callback,
-        mandatory: mandatory,
-        hide: hide,
-        aliases: aliases,
-      );
+  }) => _compoundParser.addOption(
+    name,
+    abbr: abbr,
+    help: help,
+    valueHelp: valueHelp,
+    allowed: allowed,
+    allowedHelp: allowedHelp,
+    defaultsTo: defaultsTo,
+    callback: callback,
+    mandatory: mandatory,
+    hide: hide,
+    aliases: aliases,
+  );
 }

lib/src/tools/format_tool.dart

@@ -108,13 +108,15 @@ class FormatTool extends DevTool {
       'check',
       abbr: 'c',
       negatable: false,
-      help: 'Check if changes need to be made and set the exit code '
+      help:
+          'Check if changes need to be made and set the exit code '
           'accordingly.\nImplies "--dry-run" and "--set-exit-if-changed".',
     )
     ..addSeparator('======== Other Options')
     ..addOption(
       'formatter-args',
-      help: 'Args to pass to the "dartfmt" or "dart format" process.\n'
+      help:
+          'Args to pass to the "dartfmt" or "dart format" process.\n'
           'Run "dartfmt -h -v" or "dart format -h -v" to see all available options.',
     );
 
@@ -281,11 +283,11 @@ class FormatterInputs {
 /// output of step 1 (an instance of this class) with very simple unit tests.
 class FormatExecution {
   FormatExecution.exitEarly(this.exitCode)
-      : formatProcess = null,
-        directiveOrganization = null;
+    : formatProcess = null,
+      directiveOrganization = null;
 
   FormatExecution.process(this.formatProcess, [this.directiveOrganization])
-      : exitCode = null;
+    : exitCode = null;
 
   /// If non-null, the execution is already complete and the [FormatTool] should
   /// exit with this code.
@@ -455,7 +457,8 @@ FormatExecution buildExecution(
 }) {
   FormatMode? mode;
 
-  final useRestForInputs = (context.argResults?.rest.isNotEmpty ?? false) &&
+  final useRestForInputs =
+      (context.argResults?.rest.isNotEmpty ?? false) &&
       context.commandName == 'hackFastFormat';
 
   final argResults = context.argResults;
@@ -512,7 +515,8 @@ FormatExecution buildExecution(
 
   final dartFormatter = buildFormatProcess(formatter);
   Iterable<String> args;
-  final dartStyleSupportsWriteArg = formatter != Formatter.dartStyle ||
+  final dartStyleSupportsWriteArg =
+      formatter != Formatter.dartStyle ||
       _dartStyleVersionSupportsWriteArg(path: path);
   final formatterLanguageVersion = _formatterLanguageVersion(
     formatter,
@@ -544,13 +548,10 @@ FormatExecution buildExecution(
     verbose: context.verbose,
   );
 
-  final formatProcess = ProcessDeclaration(
-      dartFormatter.executable,
-      [
-        ...args,
-        ...inputs.includedFiles,
-      ],
-      mode: ProcessStartMode.inheritStdio);
+  final formatProcess = ProcessDeclaration(dartFormatter.executable, [
+    ...args,
+    ...inputs.includedFiles,
+  ], mode: ProcessStartMode.inheritStdio);
   DirectiveOrganization? directiveOrganization;
   if (organizeDirectives) {
     directiveOrganization = DirectiveOrganization(

lib/src/tools/function_tool.dart

@@ -15,8 +15,8 @@ class FunctionTool extends DevTool {
   FunctionTool(
     FutureOr<int?> Function(DevToolExecutionContext context) function, {
     ArgParser? argParser,
-  })  : _argParser = argParser,
-        _function = function;
+  }) : _argParser = argParser,
+       _function = function;
 
   final FutureOr<int?> Function(DevToolExecutionContext context) _function;