diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9653ca7b..3824f480 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -61,10 +61,8 @@ jobs: run: dart run dependency_validator - name: Analysis run: dart run dart_dev analyze - # Format check disabled for the Dart 3 upgrade. Dart 3.7+ uses a new - # formatter style; uncomment after a dedicated format PR. - # - name: Formatting - # if: ${{ matrix.sdk == 'stable' && matrix.os == 'ubuntu' }} - # run: dart run dart_dev format --check + - name: Formatting + if: ${{ matrix.sdk == 'stable' && matrix.os == 'ubuntu' }} + run: dart run dart_dev format --check - name: Tests run: dart run dart_dev test \ No newline at end of file diff --git a/lib/src/executable.dart b/lib/src/executable.dart index 57bff238..57b79025 100644 --- a/lib/src/executable.dart +++ b/lib/src/executable.dart @@ -77,9 +77,8 @@ Future handleFastFormat(List args) async { final configFile = File(_paths.config); if (configFile.existsSync()) { final toolBuilder = FormatToolBuilder(); - parseString( - content: configFile.readAsStringSync(), - ).unit.accept(toolBuilder); + parseString(content: configFile.readAsStringSync()).unit + .accept(toolBuilder); formatTool = toolBuilder .formatDevTool; // could be null if no custom `format` entry found @@ -274,10 +273,7 @@ void main(List args) async { '''; } -Future runWithConfig( - List args, - ConfigGetter configGetter, -) async { +Future runWithConfig(List args, ConfigGetter configGetter) async { attachLoggerToStdio(args); try { diff --git a/lib/src/utils/organize_directives/organize_directives.dart b/lib/src/utils/organize_directives/organize_directives.dart index ec3407d5..7042f61d 100644 --- a/lib/src/utils/organize_directives/organize_directives.dart +++ b/lib/src/utils/organize_directives/organize_directives.dart @@ -10,9 +10,8 @@ import 'namespace_collector.dart'; /// /// Throws an ArgumentError if [sourceFileContents] cannot be parsed. String organizeDirectives(String sourceFileContents) { - final directives = parseString( - content: sourceFileContents, - ).unit.accept(NamespaceCollector())!; + final directives = parseString(content: sourceFileContents).unit + .accept(NamespaceCollector())!; if (directives.isEmpty) { return sourceFileContents; diff --git a/test/functional/analyze_tool_functional_test.dart b/test/functional/analyze_tool_functional_test.dart index 7c848a80..15aab721 100644 --- a/test/functional/analyze_tool_functional_test.dart +++ b/test/functional/analyze_tool_functional_test.dart @@ -1,6 +1,7 @@ @TestOn('vm') @Timeout(Duration(seconds: 20)) library; + import 'package:test/test.dart'; import '../functional.dart'; diff --git a/test/functional/format_tool_functional_test.dart b/test/functional/format_tool_functional_test.dart index f2e2cc01..b41386cb 100644 --- a/test/functional/format_tool_functional_test.dart +++ b/test/functional/format_tool_functional_test.dart @@ -1,6 +1,7 @@ @TestOn('vm') @Timeout(Duration(seconds: 20)) library; + import 'dart:io'; import 'package:test/test.dart'; @@ -38,29 +39,26 @@ void main() { ); }); - test( - 'passes configured languageVersion to dart format when supported', - () async { - const projectPath = - 'test/functional/fixtures/format/language_version/dart_format_configured/'; - - final process = await runDevToolFunctionalTest('format', projectPath); - final stdoutFuture = process.stdoutStream().toList(); - - await process.shouldExit(0); - - final stdout = (await stdoutFuture).join('\n'); - final expectedCommandPattern = RegExp( - [ - RegExp.escape('dart format'), - RegExp.escape('--language-version=3.0'), - r'lib[\\/]main\.dart', - ].join(r'\s+'), - ); - - expect(stdout, contains(expectedCommandPattern)); - }, - ); + test('passes configured languageVersion to dart format when supported', () async { + const projectPath = + 'test/functional/fixtures/format/language_version/dart_format_configured/'; + + final process = await runDevToolFunctionalTest('format', projectPath); + final stdoutFuture = process.stdoutStream().toList(); + + await process.shouldExit(0); + + final stdout = (await stdoutFuture).join('\n'); + final expectedCommandPattern = RegExp( + [ + RegExp.escape('dart format'), + RegExp.escape('--language-version=3.0'), + r'lib[\\/]main\.dart', + ].join(r'\s+'), + ); + + expect(stdout, contains(expectedCommandPattern)); + }); }); } diff --git a/test/functional/null_safety_functional_test.dart b/test/functional/null_safety_functional_test.dart index d511cfe7..30469a3d 100644 --- a/test/functional/null_safety_functional_test.dart +++ b/test/functional/null_safety_functional_test.dart @@ -1,6 +1,7 @@ @TestOn('vm') @Timeout(Duration(seconds: 20)) library; + import 'package:test/test.dart'; import '../functional.dart'; diff --git a/test/tools/analyze_tool_test.dart b/test/tools/analyze_tool_test.dart index 162b7b61..65e34a6d 100644 --- a/test/tools/analyze_tool_test.dart +++ b/test/tools/analyze_tool_test.dart @@ -1,5 +1,6 @@ @TestOn('vm') library; + import 'package:args/args.dart'; import 'package:args/command_runner.dart'; import 'package:dart_dev/src/dart_dev_tool.dart'; diff --git a/test/tools/compound_tool_test.dart b/test/tools/compound_tool_test.dart index 0783431f..2ffc0797 100644 --- a/test/tools/compound_tool_test.dart +++ b/test/tools/compound_tool_test.dart @@ -1,5 +1,6 @@ @TestOn('vm') library; + import 'package:args/args.dart'; import 'package:dart_dev/dart_dev.dart'; import 'package:dart_dev/src/tools/compound_tool.dart'; diff --git a/test/tools/format_tool_test.dart b/test/tools/format_tool_test.dart index d0e320b9..3837a20b 100644 --- a/test/tools/format_tool_test.dart +++ b/test/tools/format_tool_test.dart @@ -1,5 +1,6 @@ @TestOn('vm') library; + import 'dart:io'; import 'package:args/args.dart'; @@ -442,11 +443,7 @@ void main() { expect(execution.formatProcess!.executable, exe.dart); expect( execution.formatProcess!.args, - orderedEquals([ - 'format', - '--language-version=latest', - '.', - ]), + orderedEquals(['format', '--language-version=latest', '.']), ); expect(execution.formatProcess!.mode, ProcessStartMode.inheritStdio); }); @@ -545,31 +542,28 @@ void main() { }, ); - test( - 'dart_style:format uses configured language version for dart_style >=3.0.0', - () { - final context = DevToolExecutionContext(); - final execution = buildExecution( - context, - formatter: Formatter.dartStyle, - languageVersion: '3.0', - defaultMode: FormatMode.overwrite, - path: 'test/tools/fixtures/format/has_dart_style_v3', - ); - expect(execution.exitCode, isNull); - expect(execution.formatProcess!.executable, exe.dart); - expect( - execution.formatProcess!.args, - orderedEquals([ - 'run', - 'dart_style:format', - '--language-version=3.0', - '.', - ]), - ); - expect(execution.formatProcess!.mode, ProcessStartMode.inheritStdio); - }, - ); + test('dart_style:format uses configured language version for dart_style >=3.0.0', () { + final context = DevToolExecutionContext(); + final execution = buildExecution( + context, + formatter: Formatter.dartStyle, + languageVersion: '3.0', + defaultMode: FormatMode.overwrite, + path: 'test/tools/fixtures/format/has_dart_style_v3', + ); + expect(execution.exitCode, isNull); + expect(execution.formatProcess!.executable, exe.dart); + expect( + execution.formatProcess!.args, + orderedEquals([ + 'run', + 'dart_style:format', + '--language-version=3.0', + '.', + ]), + ); + expect(execution.formatProcess!.mode, ProcessStartMode.inheritStdio); + }); test('dartFormat with args', () { final argParser = FormatTool().toCommand('t').argParser; @@ -608,11 +602,7 @@ void main() { expect(execution.formatProcess!.executable, exe.dart); expect( execution.formatProcess!.args, - orderedEquals([ - 'format', - '--language-version=3.0', - '.', - ]), + orderedEquals(['format', '--language-version=3.0', '.']), ); expect(execution.formatProcess!.mode, ProcessStartMode.inheritStdio); }); @@ -741,9 +731,8 @@ void main() { setUp(() { argParser = FormatTool().toCommand('test_format').argParser; - usageException = DevToolExecutionContext( - commandName: 'test_format', - ).usageException; + usageException = DevToolExecutionContext(commandName: 'test_format') + .usageException; }); test('--check and --dry-run and --overwrite throws UsageException', () { diff --git a/test/tools/function_tool_test.dart b/test/tools/function_tool_test.dart index 3df7adce..6bcfbd43 100644 --- a/test/tools/function_tool_test.dart +++ b/test/tools/function_tool_test.dart @@ -1,5 +1,6 @@ @TestOn('vm') library; + import 'package:args/args.dart'; import 'package:args/command_runner.dart'; import 'package:dart_dev/dart_dev.dart'; diff --git a/test/tools/process_tool_test.dart b/test/tools/process_tool_test.dart index a4c221f9..52b553b0 100644 --- a/test/tools/process_tool_test.dart +++ b/test/tools/process_tool_test.dart @@ -1,5 +1,6 @@ @TestOn('vm') library; + import 'dart:async'; import 'dart:convert'; @@ -22,9 +23,11 @@ void main() { }); test('can run from a custom working directory', () async { - final tool = - DevTool.fromProcess('pwd', [], workingDirectory: 'lib') - as ProcessTool; + final tool = DevTool.fromProcess( + 'pwd', + [], + workingDirectory: 'lib', + ) as ProcessTool; expect(await tool.run(), isZero); final stdout = (await tool.process!.stdout.transform(utf8.decoder).join('')).trim(); diff --git a/test/tools/test_tool_test.dart b/test/tools/test_tool_test.dart index 1cdc7547..5f156bcb 100644 --- a/test/tools/test_tool_test.dart +++ b/test/tools/test_tool_test.dart @@ -1,5 +1,6 @@ @TestOn('vm') library; + import 'package:args/args.dart'; import 'package:args/command_runner.dart'; import 'package:dart_dev/src/dart_dev_tool.dart'; diff --git a/test/tools/webdev_serve_tool_test.dart b/test/tools/webdev_serve_tool_test.dart index 51379946..b895a8e2 100644 --- a/test/tools/webdev_serve_tool_test.dart +++ b/test/tools/webdev_serve_tool_test.dart @@ -1,5 +1,6 @@ @TestOn('vm') library; + import 'package:args/args.dart'; import 'package:args/command_runner.dart'; import 'package:dart_dev/src/dart_dev_tool.dart'; @@ -215,34 +216,31 @@ void main() { ); }); - test( - 'returns config exit code and logs if webdev is not globally activate', - () { - overrideAnsiOutput(false, () { - expect( - Logger.root.onRecord, - emitsThrough( - severeLogOf( - allOf( - contains('webdev serve could not run'), - contains( - "dart pub global activate webdev '$webdevVersionConstraint'", - ), + test('returns config exit code and logs if webdev is not globally activate', () { + overrideAnsiOutput(false, () { + expect( + Logger.root.onRecord, + emitsThrough( + severeLogOf( + allOf( + contains('webdev serve could not run'), + contains( + "dart pub global activate webdev '$webdevVersionConstraint'", ), ), ), - ); + ), + ); - expect( - buildExecution( - DevToolExecutionContext(), - environment: pubCacheWithoutWebdev.envOverride, - ).exitCode, - ExitCode.config.code, - ); - }); - }, - ); + expect( + buildExecution( + DevToolExecutionContext(), + environment: pubCacheWithoutWebdev.envOverride, + ).exitCode, + ExitCode.config.code, + ); + }); + }); group('returns a WebdevServeExecution', () { test('(default)', () { diff --git a/test/utils/arg_results_utils_test.dart b/test/utils/arg_results_utils_test.dart index bc82f4c2..701a14b8 100644 --- a/test/utils/arg_results_utils_test.dart +++ b/test/utils/arg_results_utils_test.dart @@ -1,5 +1,6 @@ @TestOn('vm') library; + import 'package:args/args.dart'; import 'package:dart_dev/src/utils/arg_results_utils.dart'; import 'package:test/test.dart'; diff --git a/test/utils/assert_no_positional_args_before_separator_test.dart b/test/utils/assert_no_positional_args_before_separator_test.dart index a60f0769..7f8ea71c 100644 --- a/test/utils/assert_no_positional_args_before_separator_test.dart +++ b/test/utils/assert_no_positional_args_before_separator_test.dart @@ -1,5 +1,6 @@ @TestOn('vm') library; + import 'package:args/args.dart'; import 'package:dart_dev/src/utils/assert_no_positional_args_before_separator.dart'; import 'package:test/test.dart'; diff --git a/test/utils/format_tool_builder_test.dart b/test/utils/format_tool_builder_test.dart index ccc3fb76..8aadaf84 100644 --- a/test/utils/format_tool_builder_test.dart +++ b/test/utils/format_tool_builder_test.dart @@ -1,5 +1,6 @@ @TestOn('vm') library; + import 'package:analyzer/dart/analysis/utilities.dart'; import 'package:dart_dev/dart_dev.dart'; import 'package:dart_dev/src/tools/over_react_format_tool.dart'; @@ -62,9 +63,9 @@ void main() { test('dartFormat', () { final visitor = FormatToolBuilder(); - parseString( - content: formatToolCascadeSrc(formatter: 'dartFormat'), - ).unit.accept(visitor); + parseString(content: formatToolCascadeSrc(formatter: 'dartFormat')) + .unit + .accept(visitor); expect(visitor.formatDevTool, isNotNull); expect(visitor.formatDevTool, isA()); @@ -77,9 +78,9 @@ void main() { test('dartStyle', () { final visitor = FormatToolBuilder(); - parseString( - content: formatToolCascadeSrc(formatter: 'dartStyle'), - ).unit.accept(visitor); + parseString(content: formatToolCascadeSrc(formatter: 'dartStyle')) + .unit + .accept(visitor); expect(visitor.formatDevTool, isNotNull); expect(visitor.formatDevTool, isA()); @@ -106,9 +107,9 @@ void main() { test('detects languageVersion', () { final visitor = FormatToolBuilder(); - parseString( - content: formatToolCascadeSrc(languageVersion: '3.0'), - ).unit.accept(visitor); + parseString(content: formatToolCascadeSrc(languageVersion: '3.0')) + .unit + .accept(visitor); expect(visitor.formatDevTool, isNotNull); expect(visitor.formatDevTool, isA()); @@ -117,17 +118,14 @@ void main() { }); }); - test( - 'sets the failedToDetectAKnownFormatter flag when an unknown FormatTool is being used', - () { - final visitor = FormatToolBuilder(); + test('sets the failedToDetectAKnownFormatter flag when an unknown FormatTool is being used', () { + final visitor = FormatToolBuilder(); - parseString(content: unknownFormatterTool).unit.accept(visitor); + parseString(content: unknownFormatterTool).unit.accept(visitor); - expect(visitor.formatDevTool, isNull); - expect(visitor.failedToDetectAKnownFormatter, isTrue); - }, - ); + expect(visitor.formatDevTool, isNull); + expect(visitor.failedToDetectAKnownFormatter, isTrue); + }); }); } diff --git a/test/utils/get_dart_version_comment_test.dart b/test/utils/get_dart_version_comment_test.dart index 74939f10..2cac0607 100644 --- a/test/utils/get_dart_version_comment_test.dart +++ b/test/utils/get_dart_version_comment_test.dart @@ -1,5 +1,6 @@ @TestOn('vm') library; + import 'package:dart_dev/src/utils/get_dart_version_comment.dart'; import 'package:test/test.dart';