Address feedback

Author: sydneyjodon-wk

lib/src/dart3_suggestors/null_safety_prep/connect_required_props.dart

@@ -28,7 +28,7 @@ import 'analyzer_plugin_utils.dart';
 class ConnectRequiredProps extends RecursiveAstVisitor with ClassSuggestor {
   /// Running list of props that should be ignored per mixin that will all be added
   /// at the end in [generatePatches].
-  final _ignoredPropsByMixin = <InterfaceElement, List<String>>{};
+  final _ignoredPropsByMixin = <InterfaceElement, Set<String>>{};
 
   @override
   visitCascadeExpression(CascadeExpression node) {
@@ -57,13 +57,7 @@ class ConnectRequiredProps extends RecursiveAstVisitor with ClassSuggestor {
 
       // Keep a running list of props to ignore per props mixin.
       final fieldName = field.name.name;
-      if (_ignoredPropsByMixin[propsElement] != null) {
-        if (!_ignoredPropsByMixin[propsElement]!.contains(fieldName)) {
-          _ignoredPropsByMixin[propsElement]!.add(fieldName);
-        }
-      } else {
-        _ignoredPropsByMixin[propsElement] = [fieldName];
-      }
+      _ignoredPropsByMixin.putIfAbsent(propsElement, () => {}).add(fieldName);
     }
   }
 
@@ -79,8 +73,7 @@ class ConnectRequiredProps extends RecursiveAstVisitor with ClassSuggestor {
 
     // Add the patches at the end so that all the props to be ignored can be collected
     // from the different args in `connect` before adding patches to avoid duplicate patches.
-    for (final propsClass in _ignoredPropsByMixin.keys) {
-      final propsToIgnore = _ignoredPropsByMixin[propsClass]!;
+    _ignoredPropsByMixin.forEach((propsClass, propsToIgnore) {
       final classNode =
           NodeLocator2(propsClass.nameOffset).searchWithin(result.unit);
       if (classNode != null && classNode is NamedCompilationUnitMember) {
@@ -131,7 +124,7 @@ class ConnectRequiredProps extends RecursiveAstVisitor with ClassSuggestor {
           }
         }
       }
-    }
+    });
   }
 
   static const connectArgNames = [

test/test_fixtures/required_props/test_package/lib/src/test_state.dart

@@ -8,7 +8,7 @@ part 'test_state.over_react.g.dart';
 
 UiFactory<FooProps> Foo = connect<FooState, FooProps>(
   mapStateToPropsWithOwnProps: (state, props) => Foo()..prop1 = 1,
-)(castUiFactory(_$Hoc)); // ignore: undefined_identifier
+)(castUiFactory(_$Foo)); // ignore: undefined_identifier
 
 mixin FooProps on UiProps {
   int prop1;