From ac8cca09f5b115269ef0fad4a0585c9a526b61d5 Mon Sep 17 00:00:00 2001 From: Ahmed Elsayed Date: Thu, 20 Mar 2025 04:45:34 +0200 Subject: [PATCH 1/2] Remove the removed --fix flag in dart format --- melos.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/melos.yaml b/melos.yaml index 11b854d..f1117ac 100644 --- a/melos.yaml +++ b/melos.yaml @@ -30,7 +30,7 @@ scripts: description: Run `flutter analyze` for all packages. format: - run: melos exec dart format . --fix + run: melos exec dart format . description: Run `dart format` for all packages. test:select: From eb8e48862c1d10582ec4d5944e0efb3b2f02cea8 Mon Sep 17 00:00:00 2001 From: Ahmed Elsayed Date: Thu, 20 Mar 2025 04:57:31 +0200 Subject: [PATCH 2/2] Fix formatting --- .github/workflows/build.yml | 3 ++- melos.yaml | 3 ++- .../lib/src/form_field_example.dart | 3 +-- .../lib/src/multi_select_example.dart | 9 +++------ .../test/examples/few_styling_example_test.dart | 6 ++---- .../test/examples/flutter_test_config.dart | 6 ++---- .../test/examples/form_field_example_test.dart | 6 ++---- .../test/examples/multi_select_example_test.dart | 6 ++---- .../test/examples/popup_icon_example_test.dart | 6 ++---- .../test/examples/popup_image_example_test.dart | 6 ++---- .../test/examples/search_example_test.dart | 6 ++---- .../test/examples/simple_example_test.dart | 6 ++---- .../test/examples/with_separators_example_test.dart | 6 ++---- .../test/utils/run_golden_tests.dart | 3 +-- .../test/utils/widget_tester_utils.dart | 3 +-- 15 files changed, 28 insertions(+), 50 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2329cb9..1de6724 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,7 +40,8 @@ jobs: melos bootstrap - name: Verify formatting - run: melos exec dart format --output=none --set-exit-if-changed . + # Remove --line-length=100 when upgrading the min dart sdk to at least 3.7 + run: melos exec dart format --output=none --set-exit-if-changed --line-length=100 . # Consider passing '--fatal-infos' for slightly stricter analysis. - name: Run flutter analyze diff --git a/melos.yaml b/melos.yaml index f1117ac..4279458 100644 --- a/melos.yaml +++ b/melos.yaml @@ -30,7 +30,8 @@ scripts: description: Run `flutter analyze` for all packages. format: - run: melos exec dart format . + # Remove --line-length=100 when upgrading the min dart sdk to at least 3.7 + run: melos exec dart format --line-length=100 . description: Run `dart format` for all packages. test:select: diff --git a/packages/dropdown_button2_test/lib/src/form_field_example.dart b/packages/dropdown_button2_test/lib/src/form_field_example.dart index 32ad21c..ad15c0e 100644 --- a/packages/dropdown_button2_test/lib/src/form_field_example.dart +++ b/packages/dropdown_button2_test/lib/src/form_field_example.dart @@ -41,8 +41,7 @@ class _FormFieldExampleState extends State { DropdownButtonFormField2( isExpanded: true, decoration: InputDecoration( - contentPadding: - const EdgeInsets.symmetric(vertical: 16, horizontal: 16), + contentPadding: const EdgeInsets.symmetric(vertical: 16, horizontal: 16), border: OutlineInputBorder( borderRadius: BorderRadius.circular(15), ), diff --git a/packages/dropdown_button2_test/lib/src/multi_select_example.dart b/packages/dropdown_button2_test/lib/src/multi_select_example.dart index 240e268..a6d4915 100644 --- a/packages/dropdown_button2_test/lib/src/multi_select_example.dart +++ b/packages/dropdown_button2_test/lib/src/multi_select_example.dart @@ -75,9 +75,8 @@ class _MultiSelectExampleState extends State { ? multiValueListenable.value = [] : multiValueListenable.value = List.from(items); } else { - multiValueListenable.value = isSelected - ? ([...multiValue]..remove(value)) - : [...multiValue, value!]; + multiValueListenable.value = + isSelected ? ([...multiValue]..remove(value)) : [...multiValue, value!]; } }, selectedItemBuilder: (context) { @@ -89,9 +88,7 @@ class _MultiSelectExampleState extends State { return Container( alignment: AlignmentDirectional.center, child: Text( - multiValue - .where((item) => item != 'All') - .join(', '), + multiValue.where((item) => item != 'All').join(', '), style: const TextStyle( fontSize: 14, overflow: TextOverflow.ellipsis, diff --git a/packages/dropdown_button2_test/test/examples/few_styling_example_test.dart b/packages/dropdown_button2_test/test/examples/few_styling_example_test.dart index 69f8b7e..a312cce 100644 --- a/packages/dropdown_button2_test/test/examples/few_styling_example_test.dart +++ b/packages/dropdown_button2_test/test/examples/few_styling_example_test.dart @@ -15,8 +15,7 @@ void main() { // THEN await expectLater( find.byType(TestApp), - matchesGoldenFile( - 'goldens/few_styling_example/${variant.name}_closed_menu.png'), + matchesGoldenFile('goldens/few_styling_example/${variant.name}_closed_menu.png'), ); // GIVEN @@ -27,8 +26,7 @@ void main() { // THEN await expectLater( find.byType(TestApp), - matchesGoldenFile( - 'goldens/few_styling_example/${variant.name}_open_menu.png'), + matchesGoldenFile('goldens/few_styling_example/${variant.name}_open_menu.png'), ); }, ); diff --git a/packages/dropdown_button2_test/test/examples/flutter_test_config.dart b/packages/dropdown_button2_test/test/examples/flutter_test_config.dart index a815ee4..5d5290a 100644 --- a/packages/dropdown_button2_test/test/examples/flutter_test_config.dart +++ b/packages/dropdown_button2_test/test/examples/flutter_test_config.dart @@ -23,8 +23,7 @@ Future testExecutable(FutureOr Function() testMain) async { /// of [.SF UI Text], [.SF UI Display], [.SF Pro Text] and [.SF Pro Display] in your package's yaml. /// It's not included in this package for licensing reasons. Future _loadRobotoFont() async { - final Future font = - rootBundle.load('assets/fonts/Roboto-Regular.ttf'); + final Future font = rootBundle.load('assets/fonts/Roboto-Regular.ttf'); final FontLoader fontLoader = FontLoader('Roboto')..addFont(font); await fontLoader.load(); } @@ -36,8 +35,7 @@ Future _loadRobotoFont() async { Future _loadMaterialIconFont() async { const f.FileSystem fs = l.LocalFileSystem(); const p.Platform platform = p.LocalPlatform(); - final f.Directory flutterRoot = - fs.directory(platform.environment['FLUTTER_ROOT']); + final f.Directory flutterRoot = fs.directory(platform.environment['FLUTTER_ROOT']); final f.File iconFont = flutterRoot.childFile( fs.path.join( diff --git a/packages/dropdown_button2_test/test/examples/form_field_example_test.dart b/packages/dropdown_button2_test/test/examples/form_field_example_test.dart index ea5cf5e..5a8904d 100644 --- a/packages/dropdown_button2_test/test/examples/form_field_example_test.dart +++ b/packages/dropdown_button2_test/test/examples/form_field_example_test.dart @@ -15,8 +15,7 @@ void main() { // THEN await expectLater( find.byType(TestApp), - matchesGoldenFile( - 'goldens/form_field_example/${variant.name}_closed_menu.png'), + matchesGoldenFile('goldens/form_field_example/${variant.name}_closed_menu.png'), ); // GIVEN @@ -27,8 +26,7 @@ void main() { // THEN await expectLater( find.byType(TestApp), - matchesGoldenFile( - 'goldens/form_field_example/${variant.name}_open_menu.png'), + matchesGoldenFile('goldens/form_field_example/${variant.name}_open_menu.png'), ); }, ); diff --git a/packages/dropdown_button2_test/test/examples/multi_select_example_test.dart b/packages/dropdown_button2_test/test/examples/multi_select_example_test.dart index 6763dcf..7d683f8 100644 --- a/packages/dropdown_button2_test/test/examples/multi_select_example_test.dart +++ b/packages/dropdown_button2_test/test/examples/multi_select_example_test.dart @@ -15,8 +15,7 @@ void main() { // THEN await expectLater( find.byType(TestApp), - matchesGoldenFile( - 'goldens/multi_select_example/${variant.name}_closed_menu.png'), + matchesGoldenFile('goldens/multi_select_example/${variant.name}_closed_menu.png'), ); // GIVEN @@ -27,8 +26,7 @@ void main() { // THEN await expectLater( find.byType(TestApp), - matchesGoldenFile( - 'goldens/multi_select_example/${variant.name}_open_menu.png'), + matchesGoldenFile('goldens/multi_select_example/${variant.name}_open_menu.png'), ); }, ); diff --git a/packages/dropdown_button2_test/test/examples/popup_icon_example_test.dart b/packages/dropdown_button2_test/test/examples/popup_icon_example_test.dart index 1f0faa2..d55771b 100644 --- a/packages/dropdown_button2_test/test/examples/popup_icon_example_test.dart +++ b/packages/dropdown_button2_test/test/examples/popup_icon_example_test.dart @@ -15,8 +15,7 @@ void main() { // THEN await expectLater( find.byType(TestApp), - matchesGoldenFile( - 'goldens/popup_icon_example/${variant.name}_closed_menu.png'), + matchesGoldenFile('goldens/popup_icon_example/${variant.name}_closed_menu.png'), ); // GIVEN @@ -27,8 +26,7 @@ void main() { // THEN await expectLater( find.byType(TestApp), - matchesGoldenFile( - 'goldens/popup_icon_example/${variant.name}_open_menu.png'), + matchesGoldenFile('goldens/popup_icon_example/${variant.name}_open_menu.png'), ); }, ); diff --git a/packages/dropdown_button2_test/test/examples/popup_image_example_test.dart b/packages/dropdown_button2_test/test/examples/popup_image_example_test.dart index 778d26f..84902bf 100644 --- a/packages/dropdown_button2_test/test/examples/popup_image_example_test.dart +++ b/packages/dropdown_button2_test/test/examples/popup_image_example_test.dart @@ -16,8 +16,7 @@ void main() { // THEN await expectLater( find.byType(TestApp), - matchesGoldenFile( - 'goldens/popup_image_example/${variant.name}_closed_menu.png'), + matchesGoldenFile('goldens/popup_image_example/${variant.name}_closed_menu.png'), ); // GIVEN @@ -28,8 +27,7 @@ void main() { // THEN await expectLater( find.byType(TestApp), - matchesGoldenFile( - 'goldens/popup_image_example/${variant.name}_open_menu.png'), + matchesGoldenFile('goldens/popup_image_example/${variant.name}_open_menu.png'), ); }, ); diff --git a/packages/dropdown_button2_test/test/examples/search_example_test.dart b/packages/dropdown_button2_test/test/examples/search_example_test.dart index 04b315a..7afe6da 100644 --- a/packages/dropdown_button2_test/test/examples/search_example_test.dart +++ b/packages/dropdown_button2_test/test/examples/search_example_test.dart @@ -15,8 +15,7 @@ void main() { // THEN await expectLater( find.byType(TestApp), - matchesGoldenFile( - 'goldens/search_example/${variant.name}_closed_menu.png'), + matchesGoldenFile('goldens/search_example/${variant.name}_closed_menu.png'), ); // GIVEN @@ -27,8 +26,7 @@ void main() { // THEN await expectLater( find.byType(TestApp), - matchesGoldenFile( - 'goldens/search_example/${variant.name}_open_menu.png'), + matchesGoldenFile('goldens/search_example/${variant.name}_open_menu.png'), ); }, ); diff --git a/packages/dropdown_button2_test/test/examples/simple_example_test.dart b/packages/dropdown_button2_test/test/examples/simple_example_test.dart index 5924c43..3614b19 100644 --- a/packages/dropdown_button2_test/test/examples/simple_example_test.dart +++ b/packages/dropdown_button2_test/test/examples/simple_example_test.dart @@ -15,8 +15,7 @@ void main() { // THEN await expectLater( find.byType(TestApp), - matchesGoldenFile( - 'goldens/simple_example/${variant.name}_closed_menu.png'), + matchesGoldenFile('goldens/simple_example/${variant.name}_closed_menu.png'), ); // GIVEN @@ -27,8 +26,7 @@ void main() { // THEN await expectLater( find.byType(TestApp), - matchesGoldenFile( - 'goldens/simple_example/${variant.name}_open_menu.png'), + matchesGoldenFile('goldens/simple_example/${variant.name}_open_menu.png'), ); }, ); diff --git a/packages/dropdown_button2_test/test/examples/with_separators_example_test.dart b/packages/dropdown_button2_test/test/examples/with_separators_example_test.dart index 2954a5b..c1bbf69 100644 --- a/packages/dropdown_button2_test/test/examples/with_separators_example_test.dart +++ b/packages/dropdown_button2_test/test/examples/with_separators_example_test.dart @@ -15,8 +15,7 @@ void main() { // THEN await expectLater( find.byType(TestApp), - matchesGoldenFile( - 'goldens/with_separators_example/${variant.name}_closed_menu.png'), + matchesGoldenFile('goldens/with_separators_example/${variant.name}_closed_menu.png'), ); // GIVEN @@ -27,8 +26,7 @@ void main() { // THEN await expectLater( find.byType(TestApp), - matchesGoldenFile( - 'goldens/with_separators_example/${variant.name}_open_menu.png'), + matchesGoldenFile('goldens/with_separators_example/${variant.name}_open_menu.png'), ); }, ); diff --git a/packages/dropdown_button2_test/test/utils/run_golden_tests.dart b/packages/dropdown_button2_test/test/utils/run_golden_tests.dart index f0f907c..3c25051 100644 --- a/packages/dropdown_button2_test/test/utils/run_golden_tests.dart +++ b/packages/dropdown_button2_test/test/utils/run_golden_tests.dart @@ -12,8 +12,7 @@ void runGoldenTests( GoldenTestCallback callback, { ValueVariant? variantsOverride, }) { - final ValueVariant variants = - variantsOverride ?? defaultVariants; + final ValueVariant variants = variantsOverride ?? defaultVariants; testWidgets( description, (WidgetTester tester) async { diff --git a/packages/dropdown_button2_test/test/utils/widget_tester_utils.dart b/packages/dropdown_button2_test/test/utils/widget_tester_utils.dart index b0a6640..4f9e6bf 100644 --- a/packages/dropdown_button2_test/test/utils/widget_tester_utils.dart +++ b/packages/dropdown_button2_test/test/utils/widget_tester_utils.dart @@ -26,8 +26,7 @@ extension WidgetTesterX on WidgetTester { /// Pauses test until images are ready to be rendered. Future precacheImages() async { final imageElements = find.byType(Image, skipOffstage: false).evaluate(); - final containerElements = - find.byType(DecoratedBox, skipOffstage: false).evaluate(); + final containerElements = find.byType(DecoratedBox, skipOffstage: false).evaluate(); await runAsync(() async { for (final element in imageElements) {