fix: support function expression invocations for prefer-moving-to-variable (#1109)

Author: incendial

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+* fix: support function expression invocations for [`prefer-moving-to-variable`](https://dartcodemetrics.dev/docs/rules/common/prefer-moving-to-variable).
 * feat: support ignoring regular comments for [`format-comment`](https://dartcodemetrics.dev/docs/rules/common/format-comment).
 
 ## 5.2.1

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

@@ -64,7 +64,7 @@ class _BlockVisitor extends RecursiveAstVisitor<void> {
   }
 
   bool _checkForDuplicates(AstNode node, Expression? target) {
-    final access = node.toString();
+    final access = _extractAccess(node);
     final visitedInvocation = _visitedInvocations[access];
     final isDuplicate =
         visitedInvocation != null && _isDuplicate(visitedInvocation, node);
@@ -86,6 +86,18 @@ class _BlockVisitor extends RecursiveAstVisitor<void> {
     return false;
   }
 
+  String _extractAccess(AstNode node) {
+    final parent = node.parent;
+    if (parent is FunctionExpressionInvocation) {
+      final typeArguments = parent.typeArguments;
+      if (typeArguments != null && typeArguments.arguments.isNotEmpty) {
+        return parent.toString();
+      }
+    }
+
+    return node.toString();
+  }
+
   bool _isDuplicate(AstNode visitedInvocation, AstNode node) {
     final visitedSwitch =
         visitedInvocation.thisOrAncestorOfType<SwitchStatement>();

test/src/analyzers/lint_analyzer/rules/rules_list/prefer_moving_to_variable/examples/generics_example.dart

@@ -0,0 +1,14 @@
+void main() {
+  final a = GetIt.instance<Object>();
+  final b = GetIt.instance<String>();
+}
+
+class GetIt {
+  static final _instance = GetIt();
+
+  static GetIt get instance => _instance;
+
+  T get<T extends Object>() => 'str' as T;
+
+  T call<T extends Object>() => get<T>;
+}

test/src/analyzers/lint_analyzer/rules/rules_list/prefer_moving_to_variable/prefer_moving_to_variable_rule_test.dart

@@ -13,6 +13,8 @@ const _scopeExamplePath =
     'prefer_moving_to_variable/examples/scope_example.dart';
 const _cascadeExamplePath =
     'prefer_moving_to_variable/examples/cascade_example.dart';
+const _genericsExamplePath =
+    'prefer_moving_to_variable/examples/generics_example.dart';
 
 void main() {
   group('PreferMovingToVariableRule', () {
@@ -213,6 +215,13 @@ void main() {
       RuleTestHelper.verifyNoIssues(issues);
     });
 
+    test('reports no issues for generics', () async {
+      final unit = await RuleTestHelper.resolveFromFile(_genericsExamplePath);
+      final issues = PreferMovingToVariableRule().check(unit);
+
+      RuleTestHelper.verifyNoIssues(issues);
+    });
+
     test('reports issues with custom config', () async {
       final unit = await RuleTestHelper.resolveFromFile(_examplePath);
       final config = {