chore: Ran lint command (#474)

conceptadev · Aug 31, 2024 · 7cd122c · 7cd122c
1 parent 849dd55
commit 7cd122c
Show file tree

Hide file tree

Showing 10 changed files with 57 additions and 54 deletions.
diff --git a/packages/mix/lib/src/modifiers/scroll_view_widget_modifier.dart b/packages/mix/lib/src/modifiers/scroll_view_widget_modifier.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
-import 'package:mix/mix.dart';
+import '../../mix.dart';
 import 'package:mix_annotations/mix_annotations.dart';
 
 part 'scroll_view_widget_modifier.g.dart';
@@ -44,6 +44,15 @@ final class ScrollViewModifierSpec
 
 final class ScrollViewModifierSpecUtility<T extends Attribute>
     extends MixUtility<T, ScrollViewModifierSpecAttribute> {
+  /// Make the scroll view reverse or not.
+  late final reverse = BoolUtility((reverse) => call(reverse: reverse));
+
+  /// Set the padding of the scroll view.
+  late final padding = SpacingUtility((padding) => call(padding: padding));
+
+  /// Set the clip behavior of the scroll view.
+  late final clipBehavior = ClipUtility((clip) => call(clipBehavior: clip));
+
   ScrollViewModifierSpecUtility(super.builder);
 
   /// Set the scroll direction of the scroll view.
@@ -55,26 +64,18 @@ final class ScrollViewModifierSpecUtility<T extends Attribute>
   /// Set the scroll direction of the scroll view to vertical.
   T vertical() => call(scrollDirection: Axis.vertical);
 
-  /// Make the scroll view reverse or not.
-  late final reverse = BoolUtility((reverse) => call(reverse: reverse));
-
-  /// Set the padding of the scroll view.
-  late final padding = SpacingUtility((padding) => call(padding: padding));
-
   /// Set the physics of the scroll view.
   T physics(ScrollPhysics physics) => call(physics: physics);
 
   /// Disable the scroll physics of the scroll view.
-  T neverScrollableScrollPhysics() => physics(NeverScrollableScrollPhysics());
+  T neverScrollableScrollPhysics() =>
+      physics(const NeverScrollableScrollPhysics());
 
   /// Set the iOS-style scroll physics of the scroll view.
-  T bouncingScrollPhysics() => physics(BouncingScrollPhysics());
+  T bouncingScrollPhysics() => physics(const BouncingScrollPhysics());
 
   /// Set the Android-style scroll physics of the scroll view.
-  T clampingScrollPhysics() => physics(ClampingScrollPhysics());
-
-  /// Set the clip behavior of the scroll view.
-  late final clipBehavior = ClipUtility((clip) => call(clipBehavior: clip));
+  T clampingScrollPhysics() => physics(const ClampingScrollPhysics());
 
   T call({
     Axis? scrollDirection,

diff --git a/packages/mix/lib/src/modifiers/widget_modifiers_util.dart b/packages/mix/lib/src/modifiers/widget_modifiers_util.dart
@@ -1,4 +1,4 @@
-import 'package:mix/src/modifiers/mouse_cursor_modifier.dart';
+import 'mouse_cursor_modifier.dart';
 
 import '../core/attribute.dart';
 import '../core/modifier.dart';

diff --git a/packages/mix/lib/src/theme/mix/mix_theme.dart b/packages/mix/lib/src/theme/mix/mix_theme.dart
@@ -99,6 +99,16 @@ class MixThemeData {
     );
   }
 
+  /// Combine all [themes] into a single [MixThemeData] root.
+  static MixThemeData combine(Iterable<MixThemeData> themes) {
+    if (themes.isEmpty) return const MixThemeData.empty();
+
+    return themes.fold(
+      const MixThemeData.empty(),
+      (previous, theme) => previous.merge(theme),
+    );
+  }
+
   MixThemeData copyWith({
     Map<BreakpointToken, Breakpoint>? breakpoints,
     Map<ColorToken, Color>? colors,
@@ -132,13 +142,6 @@ class MixThemeData {
     );
   }
 
-  /// Combine all [themes] into a single [MixThemeData] root.
-  static MixThemeData combine(Iterable<MixThemeData> themes) {
-    if (themes.isEmpty) return const MixThemeData.empty();
-    return themes.fold(
-        const MixThemeData.empty(), (previous, theme) => previous.merge(theme));
-  }
-
   @override
   operator ==(Object other) {
     if (identical(this, other)) return true;

diff --git a/packages/mix/test/src/modifiers/mouse_cursor_modifier_test.dart b/packages/mix/test/src/modifiers/mouse_cursor_modifier_test.dart
@@ -5,7 +5,7 @@ import 'package:mix/mix.dart';
 void main() {
   testWidgets('uses custom mouseCursor when provided',
       (WidgetTester tester) async {
-    final cursor = SystemMouseCursors.resizeUpRight;
+    const cursor = SystemMouseCursors.resizeUpRight;
     await tester.pumpWidget(
       Box(
         style: Style(

diff --git a/packages/mix/test/src/modifiers/scroll_view_widget_modifier_test.dart b/packages/mix/test/src/modifiers/scroll_view_widget_modifier_test.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mix/mix.dart';
-import 'package:mix/src/modifiers/scroll_view_widget_modifier.dart';
 
 import '../../helpers/testing_utils.dart';
 
@@ -11,10 +10,10 @@ void main() {
       'Build method creates SingleChildScrollView with correct parameters',
       (tester) async {
         const padding = EdgeInsets.all(8.0);
-        final axis = Axis.horizontal;
-        final reverse = true;
-        final clip = Clip.antiAlias;
-        final physics = const AlwaysScrollableScrollPhysics();
+        const axis = Axis.horizontal;
+        const reverse = true;
+        const clip = Clip.antiAlias;
+        const physics = AlwaysScrollableScrollPhysics();
 
         final modifier = ScrollViewModifierSpec(
           scrollDirection: axis,

diff --git a/packages/mix/test/src/widgets/pressable/pressable_widget_test.dart b/packages/mix/test/src/widgets/pressable/pressable_widget_test.dart
@@ -64,7 +64,7 @@ void main() {
     });
 
     testWidgets('is disposing the controller correcly', (widgetTester) async {
-      await widgetTester.pumpWidget(_DisposalPressable());
+      await widgetTester.pumpWidget(const _DisposalPressable());
     });
 
     testWidgets(
@@ -179,7 +179,7 @@ void main() {
                 $box.color.blue(),
               ),
             ),
-            child: Box(),
+            child: const Box(),
           ),
         ),
       );
@@ -703,7 +703,7 @@ Future<void> pumpTestCase({
 }
 
 class _DisposalPressable extends StatefulWidget {
-  const _DisposalPressable({Key? key}) : super(key: key);
+  const _DisposalPressable();
 
   @override
   _DisposalPressableState createState() => _DisposalPressableState();
@@ -728,7 +728,7 @@ class _DisposalPressableState extends State<_DisposalPressable> {
   Widget build(BuildContext context) {
     return Pressable(
       controller: _controller,
-      child: Box(),
+      child: const Box(),
     );
   }
 }
diff --git a/packages/mix/test/variants/context_variant_util/on_platform_util_test.dart b/packages/mix/test/variants/context_variant_util/on_platform_util_test.dart
@@ -68,7 +68,7 @@ void main() {
       (WidgetTester tester) async {
         final context = await tester.pumpAndGetContext(Container());
 
-        final variant = OnPlatformVariant(TargetPlatform.macOS);
+        const variant = OnPlatformVariant(TargetPlatform.macOS);
 
         expect(variant.when(context), isTrue);
       },
@@ -80,7 +80,7 @@ void main() {
       (WidgetTester tester) async {
         final context = await tester.pumpAndGetContext(Container());
 
-        final variant = OnPlatformVariant(TargetPlatform.windows);
+        const variant = OnPlatformVariant(TargetPlatform.windows);
 
         expect(variant.when(context), isTrue);
       },
@@ -92,7 +92,7 @@ void main() {
       (WidgetTester tester) async {
         final context = await tester.pumpAndGetContext(Container());
 
-        final variant = OnPlatformVariant(TargetPlatform.linux);
+        const variant = OnPlatformVariant(TargetPlatform.linux);
 
         expect(variant.when(context), isTrue);
       },
@@ -107,7 +107,7 @@ void main() {
       MixHelpers.isWebOverride = true;
       final context = await tester.pumpAndGetContext(Container());
 
-      final variant = OnWebVariant();
+      const variant = OnWebVariant();
 
       expect(variant.when(context), isTrue);
       MixHelpers.isWebOverride = null;

diff --git a/packages/mix_annotations/test/annotations_test.dart b/packages/mix_annotations/test/annotations_test.dart
@@ -5,14 +5,14 @@ void main() {
   group('MixableSpec', () {
     group('MixableDto', () {
       test('should create instance with default values', () {
-        final dto = MixableDto();
+        const dto = MixableDto();
         expect(dto.mergeLists, isTrue);
         expect(dto.generateValueExtension, isTrue);
         expect(dto.generateUtility, isTrue);
       });
 
       test('should create instance with provided values', () {
-        final dto = MixableDto(
+        const dto = MixableDto(
             mergeLists: false,
             generateValueExtension: false,
             generateUtility: false);
@@ -24,14 +24,14 @@ void main() {
 
     group('MixableProperty', () {
       test('should create instance with default values', () {
-        final property = MixableProperty();
+        const property = MixableProperty();
         expect(property.dto, isNull);
         expect(property.utilities, isNull);
       });
 
       test('should create instance with provided values', () {
-        final dto = MixableFieldDto(type: String);
-        final utilities = [MixableUtility(alias: 'util', type: int)];
+        const dto = MixableFieldDto(type: String);
+        final utilities = [const MixableUtility(alias: 'util', type: int)];
         final property = MixableProperty(dto: dto, utilities: utilities);
         expect(property.dto, equals(dto));
         expect(property.utilities, equals(utilities));
@@ -40,27 +40,27 @@ void main() {
 
     group('MixableFieldDto', () {
       test('should create instance with default values', () {
-        final dto = MixableFieldDto();
+        const dto = MixableFieldDto();
         expect(dto.type, isNull);
       });
 
       test('should create instance with provided values', () {
-        final dto = MixableFieldDto(type: int);
+        const dto = MixableFieldDto(type: int);
         expect(dto.type, equals(int));
       });
 
       test('typeAsString should return string representation of type', () {
-        final dto1 = MixableFieldDto(type: 'String');
+        const dto1 = MixableFieldDto(type: 'String');
         expect(dto1.typeAsString, equals('String'));
 
-        final dto2 = MixableFieldDto(type: int);
+        const dto2 = MixableFieldDto(type: int);
         expect(dto2.typeAsString, equals('int'));
       });
     });
 
     group('MixableUtility', () {
       test('should create instance with default values', () {
-        final utility = MixableUtility();
+        const utility = MixableUtility();
         expect(utility.alias, isNull);
         expect(utility.type, isNull);
         expect(utility.properties, isEmpty);
@@ -76,10 +76,10 @@ void main() {
       });
 
       test('typeAsString should return string representation of type', () {
-        final utility1 = MixableUtility(type: 'String');
+        const utility1 = MixableUtility(type: 'String');
         expect(utility1.typeAsString, equals('String'));
 
-        final utility2 = MixableUtility(type: int);
+        const utility2 = MixableUtility(type: int);
         expect(utility2.typeAsString, equals('int'));
       });
     });

diff --git a/packages/mix_generator/test/generated_code_test_cases/main.dart b/packages/mix_generator/test/generated_code_test_cases/main.dart
@@ -21,11 +21,11 @@ Future<void> main() async {
 
   testAnnotatedElements<MixableSpec>(
     readerForSpecCase,
-    MixableSpecGenerator(),
+    const MixableSpecGenerator(),
   );
 
   testAnnotatedElements<MixableDto>(
     readerForDtoCase,
-    MixableDtoGenerator(),
+    const MixableDtoGenerator(),
   );
 }
diff --git a/packages/mix_lint/lib/mix_lint.dart b/packages/mix_lint/lib/mix_lint.dart
@@ -18,11 +18,11 @@ class _MixLint extends PluginBase {
 
   @override
   List<LintRule> getLintRules(CustomLintConfigs configs) => [
-        AttributesOrdering(),
-        AvoidDefiningTokensOrVariantsWithinStyle(),
-        AvoidDefiningTokensWithinThemeData(),
-        AvoidVariantInsideContextVariant(),
-        AvoidEmptyVariants(),
+        const AttributesOrdering(),
+        const AvoidDefiningTokensOrVariantsWithinStyle(),
+        const AvoidDefiningTokensWithinThemeData(),
+        const AvoidVariantInsideContextVariant(),
+        const AvoidEmptyVariants(),
         MaxNumberOfAttributesPerStyle.fromConfig(configs),
       ];
 }