Skip to content
This repository was archived by the owner on Jul 16, 2023. It is now read-only.

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

Merged
merged 2 commits into from
Dec 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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>();
Expand Down
Original file line number Diff line number Diff line change
@@ -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>;
}
Original file line number Diff line number Diff line change
Expand Up @@ -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', () {
Expand Down Expand Up @@ -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 = {
Expand Down