refactor: replace use of Diagnostic.data with expando

Author: andrew-bekhiet-solid

lib/src/lints/avoid_final_with_getter/avoid_final_with_getter_rule.dart

@@ -39,6 +39,8 @@ class AvoidFinalWithGetterRule extends SolidLintRule {
   /// the error whether we use final private fields with getters.
   static const lintName = 'avoid_final_with_getter';
 
+  final _diagnosticsInfoExpando = Expando<FinalWithGetterInfo>();
+
   AvoidFinalWithGetterRule._(super.config);
 
   /// Creates a new instance of [AvoidFinalWithGetterRule]
@@ -64,15 +66,13 @@ class AvoidFinalWithGetterRule extends SolidLintRule {
       node.accept(visitor);
 
       for (final element in visitor.getters) {
-        reporter.atNode(
-          element.getter,
-          code,
-          data: element,
-        );
+        final diagnostic = reporter.atNode(element.getter, code);
+
+        _diagnosticsInfoExpando[diagnostic] = element;
       }
     });
   }
 
   @override
-  List<Fix> getFixes() => [_FinalWithGetterFix()];
+  List<Fix> getFixes() => [_FinalWithGetterFix(_diagnosticsInfoExpando)];
 }

lib/src/lints/avoid_final_with_getter/fixes/avoid_final_with_getter_fix.dart

@@ -1,21 +1,25 @@
 part of '../avoid_final_with_getter_rule.dart';
 
 class _FinalWithGetterFix extends DartFix {
+  final Expando<FinalWithGetterInfo> _diagnosticsInfoExpando;
+
+  _FinalWithGetterFix(this._diagnosticsInfoExpando);
+
   @override
   void run(
     CustomLintResolver resolver,
     ChangeReporter reporter,
     CustomLintContext context,
-    Diagnostic analysisError,
+    Diagnostic diagnostic,
     List<Diagnostic> others,
   ) {
     context.registry.addMethodDeclaration((node) {
-      if (analysisError.sourceRange.intersects(node.sourceRange)) {
-        final info = analysisError.data as FinalWithGetterInfo?;
-        if (info == null) return;
+      if (!diagnostic.sourceRange.intersects(node.sourceRange)) return;
+
+      final info = _diagnosticsInfoExpando[diagnostic];
+      if (info == null) return;
 
-        _addReplacement(reporter, info);
-      }
+      _addReplacement(reporter, info);
     });
   }
 

lib/src/lints/prefer_conditional_expressions/fixes/prefer_conditional_expressions_fix.dart

@@ -8,24 +8,30 @@ import 'package:solid_lints/src/lints/prefer_conditional_expressions/visitors/pr
 /// A Quick fix for `prefer_conditional_expressions` rule
 /// Suggests to remove unnecessary assertions
 class PreferConditionalExpressionsFix extends DartFix {
+  final Expando<StatementInfo> _diagnosticsInfoExpando;
+
+  /// A Quick fix for `prefer_conditional_expressions` rule
+  /// Suggests to remove unnecessary assertions
+  PreferConditionalExpressionsFix(this._diagnosticsInfoExpando);
+
   @override
   void run(
     CustomLintResolver resolver,
     ChangeReporter reporter,
     CustomLintContext context,
-    Diagnostic analysisError,
+    Diagnostic diagnostic,
     List<Diagnostic> others,
   ) {
     context.registry.addIfStatement((node) {
-      if (analysisError.sourceRange.intersects(node.sourceRange)) {
-        final statementInfo = analysisError.data as StatementInfo?;
-        if (statementInfo == null) return;
+      if (!diagnostic.sourceRange.intersects(node.sourceRange)) return;
 
-        final correction = _createCorrection(statementInfo);
-        if (correction == null) return;
+      final statementInfo = _diagnosticsInfoExpando[diagnostic];
+      if (statementInfo == null) return;
 
-        _addReplacement(reporter, statementInfo.statement, correction);
-      }
+      final correction = _createCorrection(statementInfo);
+      if (correction == null) return;
+
+      _addReplacement(reporter, statementInfo.statement, correction);
     });
   }
 

lib/src/lints/prefer_conditional_expressions/prefer_conditional_expressions_rule.dart

@@ -61,6 +61,8 @@ class PreferConditionalExpressionsRule
   /// parameters reaches the maximum value.
   static const lintName = 'prefer_conditional_expressions';
 
+  final _diagnosticsInfoExpando = Expando<StatementInfo>();
+
   PreferConditionalExpressionsRule._(super.config);
 
   /// Creates a new instance of [PreferConditionalExpressionsRule]
@@ -91,15 +93,15 @@ class PreferConditionalExpressionsRule
       node.accept(visitor);
 
       for (final element in visitor.statementsInfo) {
-        reporter.atNode(
-          element.statement,
-          code,
-          data: element,
-        );
+        final diagnostic = reporter.atNode(element.statement, code);
+
+        _diagnosticsInfoExpando[diagnostic] = element;
       }
     });
   }
 
   @override
-  List<Fix> getFixes() => [PreferConditionalExpressionsFix()];
+  List<Fix> getFixes() => [
+        PreferConditionalExpressionsFix(_diagnosticsInfoExpando),
+      ];
 }