Fixed analyzer issue, fixed linter (#177)

solid-software · Sep 18, 2024 · fc6b52b · fc6b52b
1 parent e5fb3e9
commit fc6b52b
Show file tree

Hide file tree

Showing 31 changed files with 93 additions and 109 deletions.
diff --git a/lib/src/lints/avoid_debug_print_in_release/avoid_debug_print_in_release_rule.dart b/lib/src/lints/avoid_debug_print_in_release/avoid_debug_print_in_release_rule.dart
@@ -122,7 +122,7 @@ your `debugPrint` call in a `!kReleaseMode` check.""",
       return;
     }
 
-    reporter.reportErrorForNode(code, node);
+    reporter.atNode(node, code);
   }
 
   /// Returns null if doesn't have right operand

diff --git a/lib/src/lints/avoid_final_with_getter/avoid_final_with_getter_rule.dart b/lib/src/lints/avoid_final_with_getter/avoid_final_with_getter_rule.dart
@@ -64,12 +64,10 @@ class AvoidFinalWithGetterRule extends SolidLintRule {
       node.accept(visitor);
 
       for (final element in visitor.getters) {
-        reporter.reportErrorForNode(
-          code,
+        reporter.atNode(
           element.getter,
-          null,
-          null,
-          element,
+          code,
+          data: element,
         );
       }
     });

diff --git a/lib/src/lints/avoid_final_with_getter/visitors/getter_variable_visitor.dart b/lib/src/lints/avoid_final_with_getter/visitors/getter_variable_visitor.dart
@@ -35,7 +35,7 @@ extension on MethodDeclaration {
           expression: SimpleIdentifier(
             staticElement: Element(
               declaration: PropertyAccessorElement(
-                variable: PropertyInducingElement(:final id)
+                variable2: PropertyInducingElement(:final id)
               )
             )
           )

diff --git a/lib/src/lints/avoid_global_state/avoid_global_state_rule.dart b/lib/src/lints/avoid_global_state/avoid_global_state_rule.dart
@@ -63,13 +63,13 @@ class AvoidGlobalStateRule extends SolidLintRule {
     context.registry.addTopLevelVariableDeclaration(
       (node) => node.variables.variables
           .where((variable) => variable.isPublicMutable)
-          .forEach((node) => reporter.reportErrorForNode(code, node)),
+          .forEach((node) => reporter.atNode(node, code)),
     );
     context.registry.addFieldDeclaration((node) {
       if (!node.isStatic) return;
       node.fields.variables
           .where((variable) => variable.isPublicMutable)
-          .forEach((node) => reporter.reportErrorForNode(code, node));
+          .forEach((node) => reporter.atNode(node, code));
     });
   }
 }

diff --git a/lib/src/lints/avoid_late_keyword/avoid_late_keyword_rule.dart b/lib/src/lints/avoid_late_keyword/avoid_late_keyword_rule.dart
@@ -76,7 +76,7 @@ class AvoidLateKeywordRule extends SolidLintRule<AvoidLateKeywordParameters> {
   ) {
     context.registry.addVariableDeclaration((node) {
       if (_shouldLint(node)) {
-        reporter.reportErrorForNode(code, node);
+        reporter.atNode(node, code);
       }
     });
   }

diff --git a/lib/src/lints/avoid_non_null_assertion/avoid_non_null_assertion_rule.dart b/lib/src/lints/avoid_non_null_assertion/avoid_non_null_assertion_rule.dart
@@ -86,7 +86,7 @@ class AvoidNonNullAssertionRule extends SolidLintRule {
         }
       }
 
-      reporter.reportErrorForNode(code, node);
+      reporter.atNode(node, code);
     });
   }
 }
diff --git a/lib/src/lints/avoid_returning_widgets/avoid_returning_widgets_rule.dart b/lib/src/lints/avoid_returning_widgets/avoid_returning_widgets_rule.dart
@@ -101,7 +101,7 @@ class AvoidReturningWidgetsRule
       final isOverriden = node.declaredElement?.hasOverride ?? false;
 
       if (isWidgetReturned && !isOverriden && !isIgnored) {
-        reporter.reportErrorForNode(code, node);
+        reporter.atNode(node, code);
       }
     });
   }

diff --git a/lib/src/lints/avoid_unnecessary_setstate/avoid_unnecessary_set_state_rule.dart b/lib/src/lints/avoid_unnecessary_setstate/avoid_unnecessary_set_state_rule.dart
@@ -84,7 +84,7 @@ class AvoidUnnecessarySetStateRule extends SolidLintRule {
       final visitor = AvoidUnnecessarySetStateVisitor();
       visitor.visitClassDeclaration(node);
       for (final element in visitor.setStateInvocations) {
-        reporter.reportErrorForNode(code, element);
+        reporter.atNode(element, code);
       }
     });
   }

diff --git a/lib/src/lints/avoid_unnecessary_type_assertions/avoid_unnecessary_type_assertions_rule.dart b/lib/src/lints/avoid_unnecessary_type_assertions/avoid_unnecessary_type_assertions_rule.dart
@@ -77,13 +77,13 @@ class AvoidUnnecessaryTypeAssertions extends SolidLintRule {
   ) {
     context.registry.addIsExpression((node) {
       if (_isUnnecessaryIsExpression(node)) {
-        reporter.reportErrorForNode(_unnecessaryIsCode, node);
+        reporter.atNode(node, _unnecessaryIsCode);
       }
     });
 
     context.registry.addMethodInvocation((node) {
       if (_isUnnecessaryWhereType(node)) {
-        reporter.reportErrorForNode(_unnecessaryWhereTypeCode, node);
+        reporter.atNode(node, _unnecessaryWhereTypeCode);
       }
     });
   }

diff --git a/lib/src/lints/avoid_unnecessary_type_casts/avoid_unnecessary_type_casts_rule.dart b/lib/src/lints/avoid_unnecessary_type_casts/avoid_unnecessary_type_casts_rule.dart
@@ -41,7 +41,7 @@ class AvoidUnnecessaryTypeCastsRule extends SolidLintRule {
       visitor.visitAsExpression(node);
 
       for (final element in visitor.expressions.entries) {
-        reporter.reportErrorForNode(code, element.key);
+        reporter.atNode(element.key, code);
       }
     });
   }

diff --git a/lib/src/lints/avoid_unrelated_type_assertions/avoid_unrelated_type_assertions_rule.dart b/lib/src/lints/avoid_unrelated_type_assertions/avoid_unrelated_type_assertions_rule.dart
@@ -39,10 +39,10 @@ class AvoidUnrelatedTypeAssertionsRule extends SolidLintRule {
       visitor.visitIsExpression(node);
 
       for (final element in visitor.expressions.entries) {
-        reporter.reportErrorForNode(
-          code,
+        reporter.atNode(
           element.key,
-          [element.value.toString()],
+          code,
+          arguments: [element.value.toString()],
         );
       }
     });

diff --git a/lib/src/lints/avoid_unused_parameters/avoid_unused_parameters_rule.dart b/lib/src/lints/avoid_unused_parameters/avoid_unused_parameters_rule.dart
@@ -96,7 +96,7 @@ class AvoidUnusedParametersRule extends SolidLintRule {
       node.accept(visitor);
 
       for (final element in visitor.unusedParameters) {
-        reporter.reportErrorForNode(code, element);
+        reporter.atNode(element, code);
       }
     });
   }

diff --git a/lib/src/lints/avoid_using_api/avoid_using_api_linter.dart b/lib/src/lints/avoid_using_api/avoid_using_api_linter.dart
@@ -63,7 +63,7 @@ class AvoidUsingApiLinter {
         return;
       }
 
-      reporter.reportErrorForNode(entryCode, node);
+      reporter.atNode(node, entryCode);
     });
 
     context.registry.addNamedType((node) {
@@ -72,7 +72,7 @@ class AvoidUsingApiLinter {
         return;
       }
 
-      reporter.reportErrorForNode(entryCode, node);
+      reporter.atNode(node, entryCode);
     });
   }
 
@@ -96,7 +96,7 @@ class AvoidUsingApiLinter {
 
       switch (node.staticElement) {
         case FunctionElement() || PropertyAccessorElement():
-          reporter.reportErrorForNode(entryCode, node);
+          reporter.atNode(node, entryCode);
       }
     });
   }
@@ -118,7 +118,7 @@ class AvoidUsingApiLinter {
       if (sourcePath == null || !_matchesSource(sourcePath, source)) {
         return;
       }
-      reporter.reportErrorForNode(entryCode, node);
+      reporter.atNode(node, entryCode);
     });
 
     context.registry.addSimpleIdentifier((node) {
@@ -162,7 +162,7 @@ class AvoidUsingApiLinter {
           return;
       }
 
-      reporter.reportErrorForNode(entryCode, parent);
+      reporter.atNode(parent, entryCode);
     });
 
     context.registry.addNamedType((node) {
@@ -176,9 +176,9 @@ class AvoidUsingApiLinter {
         return;
       }
 
-      reporter.reportErrorForNode(
-        entryCode,
+      reporter.atNode(
         node.parent?.parent ?? node.parent ?? node,
+        entryCode,
       );
     });
   }
@@ -219,23 +219,29 @@ class AvoidUsingApiLinter {
             return;
           }
 
-          reporter.reportErrorForNode(entryCode, node.parent ?? node);
+          reporter.atNode(
+            node.parent ?? node,
+            entryCode,
+          );
         case SimpleIdentifier(:final staticElement?):
           final parentElementName = staticElement.name;
           if (parentElementName != className) {
             return;
           }
 
-          reporter.reportErrorForNode(entryCode, node.parent ?? node);
+          reporter.atNode(
+            node.parent ?? node,
+            entryCode,
+          );
         case NamedType(:final element?):
           final parentTypeName = element.name;
           if (parentTypeName != className) {
             return;
           }
 
-          reporter.reportErrorForNode(
-            entryCode,
+          reporter.atNode(
             node.parent?.parent ?? node.parent ?? node,
+            entryCode,
           );
       }
     });

diff --git a/lib/src/lints/cyclomatic_complexity/cyclomatic_complexity_rule.dart b/lib/src/lints/cyclomatic_complexity/cyclomatic_complexity_rule.dart
@@ -57,7 +57,7 @@ class CyclomaticComplexityRule
 
       if (visitor.complexityEntities.length + 1 >
           config.parameters.maxComplexity) {
-        reporter.reportErrorForNode(code, node);
+        reporter.atNode(node, code);
       }
     });
   }

diff --git a/lib/src/lints/double_literal_format/double_literal_format_rule.dart b/lib/src/lints/double_literal_format/double_literal_format_rule.dart
@@ -81,15 +81,15 @@ class DoubleLiteralFormatRule extends SolidLintRule {
       final lexeme = node.literal.lexeme;
 
       if (lexeme.hasLeadingZero) {
-        reporter.reportErrorForNode(_leadingZeroCode, node);
+        reporter.atNode(node, _leadingZeroCode);
         return;
       }
       if (lexeme.hasLeadingDecimalPoint) {
-        reporter.reportErrorForNode(_leadingDecimalCode, node);
+        reporter.atNode(node, _leadingDecimalCode);
         return;
       }
       if (lexeme.hasTrailingZero) {
-        reporter.reportErrorForNode(_trailingZeroCode, node);
+        reporter.atNode(node, _trailingZeroCode);
         return;
       }
     });

diff --git a/lib/src/lints/function_lines_of_code/function_lines_of_code_rule.dart b/lib/src/lints/function_lines_of_code/function_lines_of_code_rule.dart
@@ -71,16 +71,16 @@ class FunctionLinesOfCodeRule
 
     if (visitor.linesWithCode.length > config.parameters.maxLines) {
       if (node is! AnnotatedNode) {
-        return reporter.reportErrorForNode(code, node);
+        return reporter.atNode(node, code);
       }
 
       final startOffset = node.firstTokenAfterCommentAndMetadata.offset;
       final lengthDifference = startOffset - node.offset;
 
-      reporter.reportErrorForOffset(
-        code,
-        startOffset,
-        node.length - lengthDifference,
+      reporter.atOffset(
+        offset: startOffset,
+        length: node.length - lengthDifference,
+        errorCode: code,
       );
     }
   }

diff --git a/lib/src/lints/member_ordering/member_ordering_rule.dart b/lib/src/lints/member_ordering/member_ordering_rule.dart
@@ -125,9 +125,9 @@ class MemberOrderingRule extends SolidLintRule<MemberOrderingParameters> {
       );
 
       for (final memberInfo in wrongOrderMembers) {
-        reporter.reportErrorForNode(
-          _createWrongOrderLintCode(memberInfo),
+        reporter.atNode(
           memberInfo.classMember,
+          _createWrongOrderLintCode(memberInfo),
         );
       }
 
@@ -137,9 +137,9 @@ class MemberOrderingRule extends SolidLintRule<MemberOrderingParameters> {
         );
 
         for (final memberInfo in alphabeticallyWrongOrderMembers) {
-          reporter.reportErrorForNode(
-            _createAlphabeticallyWrongOrderLintCode(memberInfo),
+          reporter.atNode(
             memberInfo.classMember,
+            _createAlphabeticallyWrongOrderLintCode(memberInfo),
           );
         }
       }
@@ -151,9 +151,9 @@ class MemberOrderingRule extends SolidLintRule<MemberOrderingParameters> {
         );
 
         for (final memberInfo in alphabeticallyByTypeWrongOrderMembers) {
-          reporter.reportErrorForNode(
-            _createAlphabeticallyByTypeWrongOrderLintCode(memberInfo),
+          reporter.atNode(
             memberInfo.classMember,
+            _createAlphabeticallyByTypeWrongOrderLintCode(memberInfo),
           );
         }
       }

diff --git a/lib/src/lints/member_ordering/visitors/member_ordering_visitor.dart b/lib/src/lints/member_ordering/visitors/member_ordering_visitor.dart
@@ -85,9 +85,7 @@ class MemberOrderingVisitor extends RecursiveAstVisitor<List<MemberInfo>> {
           memberOrder: _getOrder(
             closestGroup,
             declaration.fields.variables.first.name.lexeme,
-            declaration.fields.type?.type
-                    ?.getDisplayString(withNullability: false) ??
-                '_',
+            declaration.fields.type?.type?.getDisplayString() ?? '_',
             isFlutterWidget,
           ),
         ),
@@ -132,9 +130,7 @@ class MemberOrderingVisitor extends RecursiveAstVisitor<List<MemberInfo>> {
             memberOrder: _getOrder(
               closestGroup,
               declaration.name.lexeme,
-              declaration.returnType?.type
-                      ?.getDisplayString(withNullability: false) ??
-                  '_',
+              declaration.returnType?.type?.getDisplayString() ?? '_',
               isFlutterWidget,
             ),
           ),
@@ -151,9 +147,7 @@ class MemberOrderingVisitor extends RecursiveAstVisitor<List<MemberInfo>> {
             memberOrder: _getOrder(
               closestGroup,
               declaration.name.lexeme,
-              declaration.returnType?.type
-                      ?.getDisplayString(withNullability: false) ??
-                  '_',
+              declaration.returnType?.type?.getDisplayString() ?? '_',
               isFlutterWidget,
             ),
           ),

diff --git a/lib/src/lints/newline_before_return/newline_before_return_rule.dart b/lib/src/lints/newline_before_return/newline_before_return_rule.dart
@@ -102,7 +102,7 @@ class NewlineBeforeReturnRule extends SolidLintRule {
       visitor.visitReturnStatement(node);
 
       for (final element in visitor.statements) {
-        reporter.reportErrorForNode(code, element);
+        reporter.atNode(element, code);
       }
     });
   }

diff --git a/lib/src/lints/no_empty_block/no_empty_block_rule.dart b/lib/src/lints/no_empty_block/no_empty_block_rule.dart
@@ -80,7 +80,7 @@ class NoEmptyBlockRule extends SolidLintRule {
       node.accept(visitor);
 
       for (final emptyBlock in visitor.emptyBlocks) {
-        reporter.reportErrorForNode(code, emptyBlock);
+        reporter.atNode(emptyBlock, code);
       }
     });
   }

diff --git a/lib/src/lints/no_equal_then_else/no_equal_then_else_rule.dart b/lib/src/lints/no_equal_then_else/no_equal_then_else_rule.dart
@@ -71,7 +71,7 @@ class NoEqualThenElseRule extends SolidLintRule {
       node.accept(visitor);
 
       for (final element in visitor.nodes) {
-        reporter.reportErrorForNode(code, element);
+        reporter.atNode(element, code);
       }
     });
   }

diff --git a/lib/src/lints/no_magic_number/no_magic_number_rule.dart b/lib/src/lints/no_magic_number/no_magic_number_rule.dart
@@ -178,7 +178,7 @@ class NoMagicNumberRule extends SolidLintRule<NoMagicNumberParameters> {
           .where(_isNotWidgetParameter);
 
       for (final magicNumber in magicNumbers) {
-        reporter.reportErrorForNode(code, magicNumber);
+        reporter.atNode(magicNumber, code);
       }
     });
   }
@@ -212,8 +212,7 @@ class NoMagicNumberRule extends SolidLintRule<NoMagicNumberParameters> {
       l.thisOrAncestorMatching(
         (a) =>
             a is InstanceCreationExpression &&
-            a.staticType?.getDisplayString(withNullability: false) ==
-                'DateTime',
+            a.staticType?.getDisplayString() == 'DateTime',
       ) ==
       null;
 
@@ -269,8 +268,7 @@ class NoMagicNumberRule extends SolidLintRule<NoMagicNumberParameters> {
     if (staticType is! InterfaceType) return false;
 
     final widgetSupertype = staticType.allSupertypes.firstWhereOrNull(
-      (supertype) =>
-          supertype.getDisplayString(withNullability: false) == 'Widget',
+      (supertype) => supertype.getDisplayString() == 'Widget',
     );
 
     return widgetSupertype != null;