diff --git a/analysis_options.yaml b/analysis_options.yaml
index 61899c6929..1120136645 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -47,7 +47,7 @@ linter:
   rules:
     - always_declare_return_types
     - always_put_control_body_on_new_line
-    - always_put_required_named_parameters_first
+    #    - always_put_required_named_parameters_first
     #    - always_specify_types
     #    - always_use_package_imports
     - avoid_annotating_with_dynamic
diff --git a/lib/src/analyzers/lint_analyzer/lint_analyzer.dart b/lib/src/analyzers/lint_analyzer/lint_analyzer.dart
index a624c52e1d..64968ff036 100644
--- a/lib/src/analyzers/lint_analyzer/lint_analyzer.dart
+++ b/lib/src/analyzers/lint_analyzer/lint_analyzer.dart
@@ -144,17 +144,11 @@ class LintAnalyzer {
         final visitor = ScopeVisitor();
         internalResult.unit.visitChildren(visitor);
 
-        final classMetrics = _checkClassMetrics(
-          visitor,
-          internalResult,
-          config,
-        );
+        final classMetrics =
+            _checkClassMetrics(visitor, internalResult, config);
 
-        final functionMetrics = _checkFunctionMetrics(
-          visitor,
-          internalResult,
-          config,
-        );
+        final functionMetrics =
+            _checkFunctionMetrics(visitor, internalResult, config);
 
         final antiPatterns = _checkOnAntiPatterns(
           ignores,
diff --git a/lib/src/analyzers/lint_analyzer/metrics/metrics_list/cyclomatic_complexity/cyclomatic_complexity_metric.dart b/lib/src/analyzers/lint_analyzer/metrics/metrics_list/cyclomatic_complexity/cyclomatic_complexity_metric.dart
index 089f73ac82..7e7bbf8560 100644
--- a/lib/src/analyzers/lint_analyzer/metrics/metrics_list/cyclomatic_complexity/cyclomatic_complexity_metric.dart
+++ b/lib/src/analyzers/lint_analyzer/metrics/metrics_list/cyclomatic_complexity/cyclomatic_complexity_metric.dart
@@ -42,7 +42,7 @@ class CyclomaticComplexityMetric extends FunctionMetric<int> {
 
   @override
   MetricComputationResult<int> computeImplementation(
-    Declaration node,
+    AstNode node,
     Iterable<ScopedClassDeclaration> classDeclarations,
     Iterable<ScopedFunctionDeclaration> functionDeclarations,
     InternalResolvedUnitResult source,
diff --git a/lib/src/analyzers/lint_analyzer/metrics/metrics_list/halstead_volume/halstead_volume_metric.dart b/lib/src/analyzers/lint_analyzer/metrics/metrics_list/halstead_volume/halstead_volume_metric.dart
index b31b45a3c6..e974d23a34 100644
--- a/lib/src/analyzers/lint_analyzer/metrics/metrics_list/halstead_volume/halstead_volume_metric.dart
+++ b/lib/src/analyzers/lint_analyzer/metrics/metrics_list/halstead_volume/halstead_volume_metric.dart
@@ -43,7 +43,7 @@ class HalsteadVolumeMetric extends FunctionMetric<double> {
 
   @override
   MetricComputationResult<double> computeImplementation(
-    Declaration node,
+    AstNode node,
     Iterable<ScopedClassDeclaration> classDeclarations,
     Iterable<ScopedFunctionDeclaration> functionDeclarations,
     InternalResolvedUnitResult source,
diff --git a/lib/src/analyzers/lint_analyzer/metrics/metrics_list/lines_of_code_metric.dart b/lib/src/analyzers/lint_analyzer/metrics/metrics_list/lines_of_code_metric.dart
index e433a50165..5e44f4ab2f 100644
--- a/lib/src/analyzers/lint_analyzer/metrics/metrics_list/lines_of_code_metric.dart
+++ b/lib/src/analyzers/lint_analyzer/metrics/metrics_list/lines_of_code_metric.dart
@@ -37,7 +37,7 @@ class LinesOfCodeMetric extends FunctionMetric<int> {
 
   @override
   MetricComputationResult<int> computeImplementation(
-    Declaration node,
+    AstNode node,
     Iterable<ScopedClassDeclaration> classDeclarations,
     Iterable<ScopedFunctionDeclaration> functionDeclarations,
     InternalResolvedUnitResult source,
diff --git a/lib/src/analyzers/lint_analyzer/metrics/metrics_list/maintainability_index_metric.dart b/lib/src/analyzers/lint_analyzer/metrics/metrics_list/maintainability_index_metric.dart
index a388fa16b1..26edec299f 100644
--- a/lib/src/analyzers/lint_analyzer/metrics/metrics_list/maintainability_index_metric.dart
+++ b/lib/src/analyzers/lint_analyzer/metrics/metrics_list/maintainability_index_metric.dart
@@ -41,7 +41,7 @@ class MaintainabilityIndexMetric extends FunctionMetric<int> {
 
   @override
   bool supports(
-    Declaration node,
+    AstNode node,
     Iterable<ScopedClassDeclaration> classDeclarations,
     Iterable<ScopedFunctionDeclaration> functionDeclarations,
     InternalResolvedUnitResult source,
@@ -63,7 +63,7 @@ class MaintainabilityIndexMetric extends FunctionMetric<int> {
 
   @override
   MetricComputationResult<int> computeImplementation(
-    Declaration node,
+    AstNode node,
     Iterable<ScopedClassDeclaration> classDeclarations,
     Iterable<ScopedFunctionDeclaration> functionDeclarations,
     InternalResolvedUnitResult source,
diff --git a/lib/src/analyzers/lint_analyzer/metrics/metrics_list/maximum_nesting_level/maximum_nesting_level_metric.dart b/lib/src/analyzers/lint_analyzer/metrics/metrics_list/maximum_nesting_level/maximum_nesting_level_metric.dart
index 8dcd515930..f571f0e840 100644
--- a/lib/src/analyzers/lint_analyzer/metrics/metrics_list/maximum_nesting_level/maximum_nesting_level_metric.dart
+++ b/lib/src/analyzers/lint_analyzer/metrics/metrics_list/maximum_nesting_level/maximum_nesting_level_metric.dart
@@ -41,7 +41,7 @@ class MaximumNestingLevelMetric extends FunctionMetric<int> {
 
   @override
   MetricComputationResult<int> computeImplementation(
-    Declaration node,
+    AstNode node,
     Iterable<ScopedClassDeclaration> classDeclarations,
     Iterable<ScopedFunctionDeclaration> functionDeclarations,
     InternalResolvedUnitResult source,
diff --git a/lib/src/analyzers/lint_analyzer/metrics/metrics_list/number_of_methods_metric.dart b/lib/src/analyzers/lint_analyzer/metrics/metrics_list/number_of_methods_metric.dart
index b21c4ca29f..b7ebdff7ac 100644
--- a/lib/src/analyzers/lint_analyzer/metrics/metrics_list/number_of_methods_metric.dart
+++ b/lib/src/analyzers/lint_analyzer/metrics/metrics_list/number_of_methods_metric.dart
@@ -38,7 +38,7 @@ class NumberOfMethodsMetric extends ClassMetric<int> {
 
   @override
   MetricComputationResult<int> computeImplementation(
-    Declaration node,
+    AstNode node,
     Iterable<ScopedClassDeclaration> classDeclarations,
     Iterable<ScopedFunctionDeclaration> functionDeclarations,
     InternalResolvedUnitResult source,
diff --git a/lib/src/analyzers/lint_analyzer/metrics/metrics_list/number_of_parameters_metric.dart b/lib/src/analyzers/lint_analyzer/metrics/metrics_list/number_of_parameters_metric.dart
index dd03193ee4..df4bbe90c8 100644
--- a/lib/src/analyzers/lint_analyzer/metrics/metrics_list/number_of_parameters_metric.dart
+++ b/lib/src/analyzers/lint_analyzer/metrics/metrics_list/number_of_parameters_metric.dart
@@ -36,7 +36,7 @@ class NumberOfParametersMetric extends FunctionMetric<int> {
 
   @override
   bool supports(
-    Declaration node,
+    AstNode node,
     Iterable<ScopedClassDeclaration> classDeclarations,
     Iterable<ScopedFunctionDeclaration> functionDeclarations,
     InternalResolvedUnitResult source,
@@ -61,7 +61,7 @@ class NumberOfParametersMetric extends FunctionMetric<int> {
 
   @override
   MetricComputationResult<int> computeImplementation(
-    Declaration node,
+    AstNode node,
     Iterable<ScopedClassDeclaration> classDeclarations,
     Iterable<ScopedFunctionDeclaration> functionDeclarations,
     InternalResolvedUnitResult source,
diff --git a/lib/src/analyzers/lint_analyzer/metrics/metrics_list/source_lines_of_code/source_lines_of_code_metric.dart b/lib/src/analyzers/lint_analyzer/metrics/metrics_list/source_lines_of_code/source_lines_of_code_metric.dart
index 4c34047c74..509b1e0809 100644
--- a/lib/src/analyzers/lint_analyzer/metrics/metrics_list/source_lines_of_code/source_lines_of_code_metric.dart
+++ b/lib/src/analyzers/lint_analyzer/metrics/metrics_list/source_lines_of_code/source_lines_of_code_metric.dart
@@ -42,7 +42,7 @@ class SourceLinesOfCodeMetric extends FunctionMetric<int> {
 
   @override
   MetricComputationResult<int> computeImplementation(
-    Declaration node,
+    AstNode node,
     Iterable<ScopedClassDeclaration> classDeclarations,
     Iterable<ScopedFunctionDeclaration> functionDeclarations,
     InternalResolvedUnitResult source,
diff --git a/lib/src/analyzers/lint_analyzer/metrics/metrics_list/weight_of_class_metric.dart b/lib/src/analyzers/lint_analyzer/metrics/metrics_list/weight_of_class_metric.dart
index fb1e41a53e..7dfe68bd70 100644
--- a/lib/src/analyzers/lint_analyzer/metrics/metrics_list/weight_of_class_metric.dart
+++ b/lib/src/analyzers/lint_analyzer/metrics/metrics_list/weight_of_class_metric.dart
@@ -40,7 +40,7 @@ class WeightOfClassMetric extends ClassMetric<double> {
 
   @override
   bool supports(
-    Declaration node,
+    AstNode node,
     Iterable<ScopedClassDeclaration> classDeclarations,
     Iterable<ScopedFunctionDeclaration> functionDeclarations,
     InternalResolvedUnitResult source,
@@ -59,7 +59,7 @@ class WeightOfClassMetric extends ClassMetric<double> {
 
   @override
   MetricComputationResult<double> computeImplementation(
-    Declaration node,
+    AstNode node,
     Iterable<ScopedClassDeclaration> classDeclarations,
     Iterable<ScopedFunctionDeclaration> functionDeclarations,
     InternalResolvedUnitResult source,
diff --git a/lib/src/analyzers/lint_analyzer/metrics/models/class_metric.dart b/lib/src/analyzers/lint_analyzer/metrics/models/class_metric.dart
index bc0ac78628..3cd572d9f6 100644
--- a/lib/src/analyzers/lint_analyzer/metrics/models/class_metric.dart
+++ b/lib/src/analyzers/lint_analyzer/metrics/models/class_metric.dart
@@ -24,7 +24,7 @@ abstract class ClassMetric<T extends num> extends Metric<T> {
 
   @override
   String? nodeType(
-    Declaration node,
+    AstNode node,
     Iterable<ScopedClassDeclaration> classDeclarations,
     Iterable<ScopedFunctionDeclaration> functionDeclarations,
   ) =>
diff --git a/lib/src/analyzers/lint_analyzer/metrics/models/function_metric.dart b/lib/src/analyzers/lint_analyzer/metrics/models/function_metric.dart
index 9ad5d68f82..085075235b 100644
--- a/lib/src/analyzers/lint_analyzer/metrics/models/function_metric.dart
+++ b/lib/src/analyzers/lint_analyzer/metrics/models/function_metric.dart
@@ -24,7 +24,7 @@ abstract class FunctionMetric<T extends num> extends Metric<T> {
 
   @override
   String? nodeType(
-    Declaration node,
+    AstNode node,
     Iterable<ScopedClassDeclaration> classDeclarations,
     Iterable<ScopedFunctionDeclaration> functionDeclarations,
   ) =>
diff --git a/lib/src/analyzers/lint_analyzer/metrics/models/metric.dart b/lib/src/analyzers/lint_analyzer/metrics/models/metric.dart
index 86f1b146b0..2c4971565a 100644
--- a/lib/src/analyzers/lint_analyzer/metrics/models/metric.dart
+++ b/lib/src/analyzers/lint_analyzer/metrics/models/metric.dart
@@ -35,7 +35,7 @@ abstract class Metric<T extends num> {
 
   /// Returns true if the metric can be computed on this [node].
   bool supports(
-    Declaration node,
+    AstNode node,
     Iterable<ScopedClassDeclaration> classDeclarations,
     Iterable<ScopedFunctionDeclaration> functionDeclarations,
     InternalResolvedUnitResult source,
@@ -45,7 +45,7 @@ abstract class Metric<T extends num> {
 
   /// Returns the computed [MetricValue] for the given [node].
   MetricValue<T> compute(
-    Declaration node,
+    AstNode node,
     Iterable<ScopedClassDeclaration> classDeclarations,
     Iterable<ScopedFunctionDeclaration> functionDeclarations,
     InternalResolvedUnitResult source,
@@ -75,7 +75,7 @@ abstract class Metric<T extends num> {
   /// Returns the internal metric model [MetricComputationResult] for the given [node].
   @protected
   MetricComputationResult<T> computeImplementation(
-    Declaration node,
+    AstNode node,
     Iterable<ScopedClassDeclaration> classDeclarations,
     Iterable<ScopedFunctionDeclaration> functionDeclarations,
     InternalResolvedUnitResult source,
@@ -94,7 +94,7 @@ abstract class Metric<T extends num> {
   /// Returns human readable type of [node]
   @protected
   String? nodeType(
-    Declaration node,
+    AstNode node,
     Iterable<ScopedClassDeclaration> classDeclarations,
     Iterable<ScopedFunctionDeclaration> functionDeclarations,
   );
diff --git a/lib/src/analyzers/lint_analyzer/metrics/scope_utils.dart b/lib/src/analyzers/lint_analyzer/metrics/scope_utils.dart
index df5a924446..e5b9c99584 100644
--- a/lib/src/analyzers/lint_analyzer/metrics/scope_utils.dart
+++ b/lib/src/analyzers/lint_analyzer/metrics/scope_utils.dart
@@ -4,7 +4,7 @@ import '../models/scoped_function_declaration.dart';
 
 /// Returns functions belonging to the passed [classNode]
 Iterable<ScopedFunctionDeclaration> classMethods(
-  Declaration? classNode,
+  AstNode? classNode,
   Iterable<ScopedFunctionDeclaration> functionDeclarations,
 ) =>
     functionDeclarations
diff --git a/lib/src/analyzers/lint_analyzer/models/report.dart b/lib/src/analyzers/lint_analyzer/models/report.dart
index b537dec369..10269f817f 100644
--- a/lib/src/analyzers/lint_analyzer/models/report.dart
+++ b/lib/src/analyzers/lint_analyzer/models/report.dart
@@ -13,7 +13,7 @@ class Report {
   final SourceSpan location;
 
   /// The node that represents a dart code snippet in the AST structure.
-  final Declaration declaration;
+  final AstNode declaration;
 
   /// Target entity metrics.
   final Iterable<MetricValue<num>> metrics;