Issues #92, #148: refactor to use common code between two rules

Author: tozpeak

lib/src/common/visitors/select_expression_identifiers_visitor.dart

@@ -0,0 +1,26 @@
+import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/dart/ast/visitor.dart';
+
+/// This visitor is used to select all SimpleIdentifiers from Expression
+class SelectExpressionIdentifiersVisitor extends RecursiveAstVisitor<void> {
+  final _identifiers = <SimpleIdentifier>{};
+
+  /// List of SimpleIdentifiers mentioned in expression
+  Set<SimpleIdentifier> get identifiers => _identifiers;
+
+  @override
+  void visitSimpleIdentifier(SimpleIdentifier node) {
+    super.visitSimpleIdentifier(node);
+    _identifiers.add(node);
+  }
+
+  /// Helper method to process expression, even if it is a SimpleIdentifier
+  void selectFromExpression(Expression expr) {
+    if (expr case final SimpleIdentifier identifier) {
+      _identifiers.add(identifier);
+      return;
+    }
+
+    expr.visitChildren(this);
+  }
+}

lib/src/lints/avoid_unnecessary_return_variable/avoid_unnecessary_return_variable_rule.dart

@@ -3,6 +3,7 @@ import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/error/listener.dart';
 import 'package:custom_lint_builder/custom_lint_builder.dart';
 import 'package:solid_lints/src/lints/avoid_unnecessary_return_variable/visitors/avoid_unnecessary_return_variable_visitor.dart';
+import 'package:solid_lints/src/common/visitors/select_expression_identifiers_visitor.dart';
 import 'package:solid_lints/src/models/rule_config.dart';
 import 'package:solid_lints/src/models/solid_lint_rule.dart';
 
@@ -116,23 +117,10 @@ Rewrite the variable evaluation into return statement instead.""",
   }
 
   bool _isExpressionImmutable(Expression expr) {
-    switch (expr) {
-      case Literal _:
-        return true;
-
-      case final PrefixedIdentifier prefixed:
-        return _isExpressionImmutable(prefixed.prefix) &&
-            _isExpressionImmutable(prefixed.identifier);
-
-      case final BinaryExpression binExpr:
-        return _isExpressionImmutable(binExpr.leftOperand) &&
-            _isExpressionImmutable(binExpr.rightOperand);
+    final visitor = SelectExpressionIdentifiersVisitor();
+    visitor.selectFromExpression(expr);
 
-      case final SimpleIdentifier identifier:
-        return _isSimpleIdentifierImmutable(identifier);
-    }
-
-    return false;
+    return visitor.identifiers.every(_isSimpleIdentifierImmutable);
   }
 
   bool _isSimpleIdentifierImmutable(SimpleIdentifier identifier) {