refactor(mix_generator): fix lints (#395)

* refactor: fix lints * Update box_spec.dart * Update pubspec.yaml * Update test.yml * Revert "Update test.yml" This reverts commit a6b58a9.
conceptadev · Jul 24, 2024 · 2a9a7bb · 2a9a7bb
1 parent 3569a36
commit 2a9a7bb
Show file tree

Hide file tree

Showing 15 changed files with 120 additions and 82 deletions.
diff --git a/packages/mix/lib/src/specs/box/box_spec.dart b/packages/mix/lib/src/specs/box/box_spec.dart
@@ -4,8 +4,6 @@ import 'package:flutter/widgets.dart';
 import 'package:mix/mix.dart';
 import 'package:mix_annotations/mix_annotations.dart';
 
-import '../../internal/diagnostic_properties_builder_ext.dart';
-
 part 'box_spec.g.dart';
 
 const _constraints = MixableUtility(

diff --git a/packages/mix/lib/src/specs/box/box_spec.g.dart b/packages/mix/lib/src/specs/box/box_spec.g.dart
diff --git a/packages/mix/lib/src/specs/flex/flex_spec.dart b/packages/mix/lib/src/specs/flex/flex_spec.dart
@@ -4,8 +4,6 @@ import 'package:flutter/widgets.dart';
 import 'package:mix/mix.dart';
 import 'package:mix_annotations/mix_annotations.dart';
 
-import '../../internal/diagnostic_properties_builder_ext.dart';
-
 part 'flex_spec.g.dart';
 
 @MixableSpec()

diff --git a/packages/mix/lib/src/specs/flex/flex_spec.g.dart b/packages/mix/lib/src/specs/flex/flex_spec.g.dart
diff --git a/packages/mix/lib/src/specs/icon/icon_spec.dart b/packages/mix/lib/src/specs/icon/icon_spec.dart
@@ -4,8 +4,6 @@ import 'package:flutter/widgets.dart';
 import 'package:mix/mix.dart';
 import 'package:mix_annotations/mix_annotations.dart';
 
-import '../../internal/diagnostic_properties_builder_ext.dart';
-
 part 'icon_spec.g.dart';
 
 @MixableSpec()

diff --git a/packages/mix/lib/src/specs/icon/icon_spec.g.dart b/packages/mix/lib/src/specs/icon/icon_spec.g.dart
diff --git a/packages/mix/lib/src/specs/image/image_spec.dart b/packages/mix/lib/src/specs/image/image_spec.dart
@@ -4,8 +4,6 @@ import 'package:flutter/widgets.dart';
 import 'package:mix/mix.dart';
 import 'package:mix_annotations/mix_annotations.dart';
 
-import '../../internal/diagnostic_properties_builder_ext.dart';
-
 part 'image_spec.g.dart';
 
 @MixableSpec()

diff --git a/packages/mix/lib/src/specs/image/image_spec.g.dart b/packages/mix/lib/src/specs/image/image_spec.g.dart
diff --git a/packages/mix/lib/src/specs/stack/stack_spec.dart b/packages/mix/lib/src/specs/stack/stack_spec.dart
@@ -4,8 +4,6 @@ import 'package:flutter/widgets.dart';
 import 'package:mix/mix.dart';
 import 'package:mix_annotations/mix_annotations.dart';
 
-import '../../internal/diagnostic_properties_builder_ext.dart';
-
 part 'stack_spec.g.dart';
 
 @MixableSpec()

diff --git a/packages/mix/lib/src/specs/stack/stack_spec.g.dart b/packages/mix/lib/src/specs/stack/stack_spec.g.dart
diff --git a/packages/mix/lib/src/specs/text/text_spec.dart b/packages/mix/lib/src/specs/text/text_spec.dart
@@ -4,8 +4,6 @@ import 'package:flutter/widgets.dart';
 import 'package:mix/mix.dart';
 import 'package:mix_annotations/mix_annotations.dart';
 
-import '../../internal/diagnostic_properties_builder_ext.dart';
-
 part 'text_spec.g.dart';
 
 @MixableSpec()

diff --git a/packages/mix/lib/src/specs/text/text_spec.g.dart b/packages/mix/lib/src/specs/text/text_spec.g.dart
diff --git a/packages/mix/pubspec.yaml b/packages/mix/pubspec.yaml
@@ -13,7 +13,7 @@ dependencies:
     sdk: flutter
 
 dev_dependencies:
-  flutter_lints: ^3.0.1
+  flutter_lints: ^4.0.0
   flutter_test:
     sdk: flutter
   dart_code_metrics_presets: ^2.13.0

diff --git a/packages/mix_generator/lib/src/builders/method_debug_fill_properties.dart b/packages/mix_generator/lib/src/builders/method_debug_fill_properties.dart
@@ -10,9 +10,9 @@ String methodDebugFillProperties({
   final fieldStatements = fields.map((field) {
     final fieldName = isInternalRef ? field.asInternalRef : field.name;
     if (_expandableFields.contains(fieldName)) {
-      return 'properties.add(DiagnosticsProperty(\'$fieldName\', $fieldName, expandableValue: true));';
+      return 'properties.add(DiagnosticsProperty(\'$fieldName\', $fieldName, expandableValue: true, defaultValue: null));';
     }
-    return 'properties.add(DiagnosticsProperty(\'$fieldName\', $fieldName));';
+    return 'properties.add(DiagnosticsProperty(\'$fieldName\', $fieldName, defaultValue: null));';
   }).join('\n');
 
   return '''

diff --git a/packages/mix_generator/lib/src/builders/method_merge.dart b/packages/mix_generator/lib/src/builders/method_merge.dart
@@ -50,7 +50,7 @@ String mergeMethodBuilder({
 
       return '$propAssignment $thisName$nullable.merge(other.$propName) ?? other.$propName';
     } else {
-      return '$propAssignment other$nullable.$propName ?? $thisName';
+      return '$propAssignment other.$propName ?? $thisName';
     }
   }).join(',\n      ');