fix: handle dynamics in map literals for avoid-dynamic

Author: incendial

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Unreleased
+
+* fix: handle dynamics in map literals for [`avoid-dynamic`](https://dcm.dev/docs/individuals/rules/common/avoid-dynamic).
+
 ## 5.6.0
 
 * fix: correctly handle implicit type parameters for [`no-equal-arguments`](https://dcm.dev/docs/individuals/rules/common/no-equal-arguments).

lib/src/analyzers/lint_analyzer/rules/rules_list/avoid_dynamic/visitor.dart

@@ -10,13 +10,17 @@ class _Visitor extends RecursiveAstVisitor<void> {
     final parent = node.parent;
     if (parent is NamedType && (parent.type?.isDynamic ?? false)) {
       final grandParent = node.parent?.parent;
-      if (grandParent != null) {
-        final grandGrandParent = grandParent.parent;
-        if (!(grandGrandParent is NamedType &&
-            (grandGrandParent.type?.isDartCoreMap ?? false))) {
-          _nodes.add(grandParent);
-        }
+      if (grandParent != null && !_isWithinMap(grandParent)) {
+        _nodes.add(grandParent);
       }
     }
   }
+
+  bool _isWithinMap(AstNode grandParent) {
+    final grandGrandParent = grandParent.parent;
+
+    return grandGrandParent is NamedType &&
+            (grandGrandParent.type?.isDartCoreMap ?? false) ||
+        grandGrandParent is SetOrMapLiteral && grandGrandParent.isMap;
+  }
 }

test/src/analyzers/lint_analyzer/rules/rules_list/avoid_dynamic/avoid_dynamic_rule_test.dart

@@ -25,7 +25,7 @@ void main() {
 
       RuleTestHelper.verifyIssues(
         issues: issues,
-        startLines: [2, 6, 10, 10, 10, 12, 23, 28, 31, 38],
+        startLines: [2, 6, 10, 10, 10, 12, 23, 28, 31, 39],
         startColumns: [3, 4, 1, 22, 33, 7, 3, 3, 3, 32],
         locationTexts: [
           'dynamic s = 1',

test/src/analyzers/lint_analyzer/rules/rules_list/avoid_dynamic/examples/example.dart

@@ -35,4 +35,9 @@ class SomeClass {
 
 abstract class BaseClass<T> {}
 
-class Generic extends BaseClass<dynamic> {} // LINT
+// LINT
+class Generic extends BaseClass<dynamic> {
+  final Map<String, dynamic> myMap = {};
+
+  final myMap = <String, dynamic>{};
+}