diff --git a/packages/yx_scope_flutter/example/pubspec.yaml b/packages/yx_scope_flutter/example/pubspec.yaml index 3f0c8fd..7f626cf 100644 --- a/packages/yx_scope_flutter/example/pubspec.yaml +++ b/packages/yx_scope_flutter/example/pubspec.yaml @@ -18,7 +18,7 @@ dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^2.0.0 - custom_lint: ^0.5.3 + custom_lint: ^0.6.8 yx_scope_linter: ^0.1.0 flutter: diff --git a/packages/yx_scope_linter/example/pubspec.yaml b/packages/yx_scope_linter/example/pubspec.yaml index 850677d..82c1eb3 100644 --- a/packages/yx_scope_linter/example/pubspec.yaml +++ b/packages/yx_scope_linter/example/pubspec.yaml @@ -11,6 +11,6 @@ dependencies: dev_dependencies: lints: ^2.0.0 - custom_lint: + custom_lint: ^0.6.8 yx_scope_linter: path: .. diff --git a/packages/yx_scope_linter/lib/src/lints/consider_dep_suffix.dart b/packages/yx_scope_linter/lib/src/lints/consider_dep_suffix.dart index 66b2836..d408369 100644 --- a/packages/yx_scope_linter/lib/src/lints/consider_dep_suffix.dart +++ b/packages/yx_scope_linter/lib/src/lints/consider_dep_suffix.dart @@ -1,4 +1,4 @@ -import 'package:analyzer/error/error.dart'; +import 'package:analyzer/error/error.dart' hide LintCode; import 'package:analyzer/error/listener.dart'; import 'package:custom_lint_builder/custom_lint_builder.dart'; import 'package:yx_scope_linter/src/extensions.dart'; @@ -33,11 +33,11 @@ class ConsiderDepSuffix extends DartLintRule { continue; } - reporter.reportErrorForToken( + reporter.atToken( + dep.nameToken, _code.copyWith( correctionMessage: 'Change the name to `${dep.name}$_suffix`', ), - dep.nameToken, ); } }); diff --git a/packages/yx_scope_linter/lib/src/lints/dep_cycle.dart b/packages/yx_scope_linter/lib/src/lints/dep_cycle.dart index eba5455..0b37c5f 100644 --- a/packages/yx_scope_linter/lib/src/lints/dep_cycle.dart +++ b/packages/yx_scope_linter/lib/src/lints/dep_cycle.dart @@ -1,4 +1,4 @@ -import 'package:analyzer/error/error.dart'; +import 'package:analyzer/error/error.dart' hide LintCode; import 'package:analyzer/error/listener.dart'; import 'package:custom_lint_builder/custom_lint_builder.dart'; import 'package:yx_scope_linter/src/extensions.dart'; @@ -45,13 +45,13 @@ class DepCycle extends DartLintRule { final cycleDeps = cycle.map((e) => deps[e]).whereType(); for (final dep in cycleDeps) { - reporter.reportErrorForToken( + reporter.atToken( + dep.nameToken, _code.copyWith( problemMessage: '$_message: ${cycleDeps.map((e) => e.name).join(' <- ')}' ' <- ${cycleDeps.first.name}', ), - dep.nameToken, ); } } diff --git a/packages/yx_scope_linter/lib/src/lints/final_dep.dart b/packages/yx_scope_linter/lib/src/lints/final_dep.dart index 804dc95..3cb3418 100644 --- a/packages/yx_scope_linter/lib/src/lints/final_dep.dart +++ b/packages/yx_scope_linter/lib/src/lints/final_dep.dart @@ -1,5 +1,5 @@ import 'package:analyzer/dart/ast/ast.dart'; -import 'package:analyzer/error/error.dart'; +import 'package:analyzer/error/error.dart' hide LintCode; import 'package:analyzer/error/listener.dart'; import 'package:custom_lint_builder/custom_lint_builder.dart'; import 'package:yx_scope_linter/src/priority.dart'; @@ -30,12 +30,10 @@ class FinalDep extends DartLintRule { final field = dep.field; if (!field.fields.isFinal) { - reporter.reportErrorForToken( - _code, + reporter.atToken( dep.nameToken, - [], - [], - field.fields, + _code, + data: field.fields, ); } } diff --git a/packages/yx_scope_linter/lib/src/lints/pass_async_lifecycle_in_initialize_queue.dart b/packages/yx_scope_linter/lib/src/lints/pass_async_lifecycle_in_initialize_queue.dart index 450a34f..79b59fa 100644 --- a/packages/yx_scope_linter/lib/src/lints/pass_async_lifecycle_in_initialize_queue.dart +++ b/packages/yx_scope_linter/lib/src/lints/pass_async_lifecycle_in_initialize_queue.dart @@ -1,5 +1,5 @@ import 'package:analyzer/dart/ast/ast.dart'; -import 'package:analyzer/error/error.dart'; +import 'package:analyzer/error/error.dart' hide LintCode; import 'package:analyzer/error/listener.dart'; import 'package:custom_lint_builder/custom_lint_builder.dart'; import 'package:yx_scope_linter/src/names.dart'; @@ -47,7 +47,10 @@ class PassAsyncLifecycleInInitializeQueue extends DartLintRule { continue; } if (!queueDeps.contains(dep.name)) { - reporter.reportErrorForToken(_code, dep.nameToken); + reporter.atToken( + dep.nameToken, + _code, + ); } } }); diff --git a/packages/yx_scope_linter/lib/src/lints/use_async_dep_for_async_lifecycle.dart b/packages/yx_scope_linter/lib/src/lints/use_async_dep_for_async_lifecycle.dart index d61e102..24d2027 100644 --- a/packages/yx_scope_linter/lib/src/lints/use_async_dep_for_async_lifecycle.dart +++ b/packages/yx_scope_linter/lib/src/lints/use_async_dep_for_async_lifecycle.dart @@ -1,7 +1,7 @@ import 'package:analyzer/dart/ast/ast.dart'; import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/dart/element/type.dart'; -import 'package:analyzer/error/error.dart'; +import 'package:analyzer/error/error.dart' hide LintCode; import 'package:analyzer/error/listener.dart'; import 'package:custom_lint_builder/custom_lint_builder.dart'; import 'package:yx_scope_linter/src/priority.dart'; @@ -51,12 +51,10 @@ class UseAsyncDepForAsyncLifecycle extends DartLintRule { final implementsAsyncLifecycle = asyncLifecycleType.isAssignableFromType(depClass.thisType); if (implementsAsyncLifecycle) { - reporter.reportErrorForToken( - _code, + reporter.atToken( methodInvocation.methodName.token, - [], - [], - methodInvocation, + _code, + data: methodInvocation, ); } } diff --git a/packages/yx_scope_linter/lib/src/utils.dart b/packages/yx_scope_linter/lib/src/utils.dart index 304729b..e8a62f4 100644 --- a/packages/yx_scope_linter/lib/src/utils.dart +++ b/packages/yx_scope_linter/lib/src/utils.dart @@ -11,7 +11,7 @@ import 'types.dart'; class ClassUtils { static bool implementsInterface(ClassElement element, String ancestorName) => element.interfaces - .map((e) => e.getDisplayString(withNullability: false)) + .map((e) => e.getDisplayString()) .contains(ancestorName); static bool isScopeContainer(ClassDeclaration node) { diff --git a/packages/yx_scope_linter/pubspec.yaml b/packages/yx_scope_linter/pubspec.yaml index 6c78cb6..f460cc6 100644 --- a/packages/yx_scope_linter/pubspec.yaml +++ b/packages/yx_scope_linter/pubspec.yaml @@ -13,9 +13,9 @@ environment: sdk: '>=2.19.6 <4.0.0' dependencies: - analyzer: ^5.13.0 + analyzer: ^6.4.1 analyzer_plugin: ^0.11.2 - custom_lint_builder: ^0.5.3 + custom_lint_builder: ^0.6.2 yx_scope: ^1.0.0 dev_dependencies: