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

Commit 87add35

committed

fix: handle dynamics in map literals for avoid-dynamic

1 parent 66f2cc9 commit 87add35Copy full SHA for 87add35

File tree

+21

-8

lines changed

CHANGELOG.md
lib/src/analyzers/lint_analyzer/rules/rules_list/avoid_dynamic
- visitor.dart
test/src/analyzers/lint_analyzer/rules/rules_list/avoid_dynamic
- avoid_dynamic_rule_test.dart
- examples
  - example.dart

+21

-8

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,9 @@`
`1`	`1`	`# Changelog`
`2`	`2`
	`3`	`+## Unreleased`
	`4`	`+`
	`5`	+* fix: handle dynamics in map literals for [`avoid-dynamic`](https://dcm.dev/docs/individuals/rules/common/avoid-dynamic).
	`6`	`+`
`3`	`7`	`## 5.6.0`
`4`	`8`
`5`	`9`	* fix: correctly handle implicit type parameters for [`no-equal-arguments`](https://dcm.dev/docs/individuals/rules/common/no-equal-arguments).

Lines changed: 10 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,13 +10,17 @@ class _Visitor extends RecursiveAstVisitor<void> {`
`10`	`10`	`final parent = node.parent;`
`11`	`11`	`if (parent is NamedType && (parent.type?.isDynamic ?? false)) {`
`12`	`12`	`final grandParent = node.parent?.parent;`
`13`		`- if (grandParent != null) {`
`14`		`- final grandGrandParent = grandParent.parent;`
`15`		`- if (!(grandGrandParent is NamedType &&`
`16`		`- (grandGrandParent.type?.isDartCoreMap ?? false))) {`
`17`		`- _nodes.add(grandParent);`
`18`		`- }`
	`13`	`+ if (grandParent != null && !_isWithinMap(grandParent)) {`
	`14`	`+ _nodes.add(grandParent);`
`19`	`15`	`}`
`20`	`16`	`}`
`21`	`17`	`}`
	`18`	`+`
	`19`	`+ bool _isWithinMap(AstNode grandParent) {`
	`20`	`+ final grandGrandParent = grandParent.parent;`
	`21`	`+`
	`22`	`+ return grandGrandParent is NamedType &&`
	`23`	`+ (grandGrandParent.type?.isDartCoreMap ?? false) \|\|`
	`24`	`+ grandGrandParent is SetOrMapLiteral && grandGrandParent.isMap;`
	`25`	`+ }`
`22`	`26`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ void main() {`
`25`	`25`
`26`	`26`	`RuleTestHelper.verifyIssues(`
`27`	`27`	`issues: issues,`
`28`		`- startLines: [2, 6, 10, 10, 10, 12, 23, 28, 31, 38],`
	`28`	`+ startLines: [2, 6, 10, 10, 10, 12, 23, 28, 31, 39],`
`29`	`29`	`startColumns: [3, 4, 1, 22, 33, 7, 3, 3, 3, 32],`
`30`	`30`	`locationTexts: [`
`31`	`31`	`'dynamic s = 1',`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -35,4 +35,9 @@ class SomeClass {`
`35`	`35`
`36`	`36`	`abstract class BaseClass<T> {}`
`37`	`37`
`38`		`-class Generic extends BaseClass<dynamic> {} // LINT`
	`38`	`+// LINT`
	`39`	`+class Generic extends BaseClass<dynamic> {`
	`40`	`+ final Map<String, dynamic> myMap = {};`
	`41`	`+`
	`42`	`+ final myMap = <String, dynamic>{};`
	`43`	`+}`

Comments

(0)