Skip to content

Commit 0369853

Browse files
chore: upgrade to analyzer 8
chore: replace usage of deprecated members
1 parent 7a96dd6 commit 0369853

File tree

52 files changed

+141
-145
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+141
-145
lines changed

lib/src/common/parameters/excluded_identifiers_list_parameter.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class ExcludedIdentifiersListParameter {
5555

5656
/// Returns whether the target node should be ignored during analysis.
5757
bool shouldIgnore(Declaration node) {
58-
final declarationName = node.declaredFragment?.name2;
58+
final declarationName = node.declaredFragment?.name;
5959

6060
final excludedItem = exclude.firstWhereOrNull(
6161
(e) {

lib/src/lints/avoid_debug_print_in_release/avoid_debug_print_in_release_rule.dart

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ your `debugPrint` call in a `!kReleaseMode` check.""",
6161
@override
6262
void run(
6363
CustomLintResolver resolver,
64-
ErrorReporter reporter,
64+
DiagnosticReporter reporter,
6565
CustomLintContext context,
6666
) {
6767
context.registry.addFunctionExpressionInvocation(
@@ -102,7 +102,7 @@ your `debugPrint` call in a `!kReleaseMode` check.""",
102102
void _checkIdentifier({
103103
required Identifier identifier,
104104
required AstNode node,
105-
required ErrorReporter reporter,
105+
required DiagnosticReporter reporter,
106106
}) {
107107
if (!_isDebugPrintNode(identifier)) {
108108
return;
@@ -137,7 +137,7 @@ your `debugPrint` call in a `!kReleaseMode` check.""",
137137
/// Handles variable assignment and declaration
138138
void _handleVariableAssignmentDeclaration({
139139
required AstNode node,
140-
required ErrorReporter reporter,
140+
required DiagnosticReporter reporter,
141141
}) {
142142
final rightOperand = _getRightOperand(node.childEntities.toList());
143143

@@ -159,10 +159,10 @@ your `debugPrint` call in a `!kReleaseMode` check.""",
159159
case PrefixedIdentifier():
160160
final prefix = node.prefix.name;
161161
name = node.name.replaceAll('$prefix.', '');
162-
sourcePath = node.element?.library2?.uri.toString() ?? '';
162+
sourcePath = node.element?.library?.uri.toString() ?? '';
163163
case SimpleIdentifier():
164164
name = node.name;
165-
sourcePath = node.element?.library2?.uri.toString() ?? '';
165+
sourcePath = node.element?.library?.uri.toString() ?? '';
166166

167167
default:
168168
return false;
@@ -193,10 +193,10 @@ your `debugPrint` call in a `!kReleaseMode` check.""",
193193
final prefix = node.prefix.name;
194194

195195
name = node.name.replaceAll('$prefix.', '');
196-
sourcePath = node.element?.library2?.uri.toString() ?? '';
196+
sourcePath = node.element?.library?.uri.toString() ?? '';
197197
case SimpleIdentifier():
198198
name = node.name;
199-
sourcePath = node.element?.library2?.uri.toString() ?? '';
199+
sourcePath = node.element?.library?.uri.toString() ?? '';
200200
default:
201201
return false;
202202
}

lib/src/lints/avoid_final_with_getter/avoid_final_with_getter_rule.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:analyzer/error/error.dart' as error;
1+
import 'package:analyzer/diagnostic/diagnostic.dart';
22
import 'package:analyzer/error/listener.dart';
33
import 'package:analyzer/source/source_range.dart';
44
import 'package:custom_lint_builder/custom_lint_builder.dart';
@@ -56,7 +56,7 @@ class AvoidFinalWithGetterRule extends SolidLintRule {
5656
@override
5757
void run(
5858
CustomLintResolver resolver,
59-
ErrorReporter reporter,
59+
DiagnosticReporter reporter,
6060
CustomLintContext context,
6161
) {
6262
context.registry.addCompilationUnit((node) {

lib/src/lints/avoid_final_with_getter/fixes/avoid_final_with_getter_fix.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ class _FinalWithGetterFix extends DartFix {
66
CustomLintResolver resolver,
77
ChangeReporter reporter,
88
CustomLintContext context,
9-
error.AnalysisError analysisError,
10-
List<error.AnalysisError> others,
9+
Diagnostic analysisError,
10+
List<Diagnostic> others,
1111
) {
1212
context.registry.addMethodDeclaration((node) {
1313
if (analysisError.sourceRange.intersects(node.sourceRange)) {

lib/src/lints/avoid_final_with_getter/visitors/avoid_final_with_getter_visitor.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'package:analyzer/dart/ast/ast.dart';
22
import 'package:analyzer/dart/ast/visitor.dart';
3-
import 'package:analyzer/dart/element/element2.dart';
3+
import 'package:analyzer/dart/element/element.dart';
44
import 'package:solid_lints/src/lints/avoid_final_with_getter/visitors/getter_variable_visitor.dart';
55

66
/// A visitor that checks for final private fields with getters.
@@ -17,7 +17,7 @@ class AvoidFinalWithGetterVisitor extends RecursiveAstVisitor<void> {
1717
case MethodDeclaration(
1818
isGetter: true,
1919
declaredFragment: ExecutableFragment(
20-
element: ExecutableElement2(
20+
element: ExecutableElement(
2121
isAbstract: false,
2222
isPublic: true,
2323
)

lib/src/lints/avoid_final_with_getter/visitors/getter_variable_visitor.dart

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'package:analyzer/dart/ast/ast.dart';
22
import 'package:analyzer/dart/ast/visitor.dart';
3-
import 'package:analyzer/dart/element/element2.dart';
3+
import 'package:analyzer/dart/element/element.dart';
44

55
/// A visitor that checks the association of the getter with
66
/// the final private variable
@@ -31,14 +31,13 @@ class GetterVariableVisitor extends RecursiveAstVisitor<void> {
3131

3232
extension on MethodDeclaration {
3333
int? get getterReferenceId {
34-
if (body is! ExpressionFunctionBody) return null;
35-
36-
final expression = (body as ExpressionFunctionBody).expression;
37-
if (expression is SimpleIdentifier) {
38-
final element = expression.element;
39-
if (element is PropertyAccessorElement2) {
40-
return element.variable3?.id;
41-
}
34+
if (body
35+
case ExpressionFunctionBody(
36+
expression: SimpleIdentifier(
37+
element: PropertyAccessorElement(:final variable)
38+
)
39+
)) {
40+
return variable.id;
4241
}
4342

4443
return null;

lib/src/lints/avoid_global_state/avoid_global_state_rule.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class AvoidGlobalStateRule extends SolidLintRule {
5757
@override
5858
void run(
5959
CustomLintResolver resolver,
60-
ErrorReporter reporter,
60+
DiagnosticReporter reporter,
6161
CustomLintContext context,
6262
) {
6363
context.registry.addTopLevelVariableDeclaration(
@@ -77,7 +77,7 @@ class AvoidGlobalStateRule extends SolidLintRule {
7777
extension on VariableDeclaration {
7878
bool get isMutable => !isFinal && !isConst;
7979

80-
bool get isPrivate => declaredElement2?.isPrivate ?? false;
80+
bool get isPrivate => declaredFragment?.element.isPrivate ?? false;
8181

8282
bool get isPublicMutable => isMutable && !isPrivate;
8383
}

lib/src/lints/avoid_late_keyword/avoid_late_keyword_rule.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class AvoidLateKeywordRule extends SolidLintRule<AvoidLateKeywordParameters> {
7171
@override
7272
void run(
7373
CustomLintResolver resolver,
74-
ErrorReporter reporter,
74+
DiagnosticReporter reporter,
7575
CustomLintContext context,
7676
) {
7777
context.registry.addVariableDeclaration((node) {

lib/src/lints/avoid_non_null_assertion/avoid_non_null_assertion_rule.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class AvoidNonNullAssertionRule extends SolidLintRule {
6060
@override
6161
void run(
6262
CustomLintResolver resolver,
63-
ErrorReporter reporter,
63+
DiagnosticReporter reporter,
6464
CustomLintContext context,
6565
) {
6666
context.registry.addPostfixExpression((node) {

lib/src/lints/avoid_returning_widgets/avoid_returning_widgets_rule.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class AvoidReturningWidgetsRule
7777
@override
7878
void run(
7979
CustomLintResolver resolver,
80-
ErrorReporter reporter,
80+
DiagnosticReporter reporter,
8181
CustomLintContext context,
8282
) {
8383
context.registry.addDeclaration((node) {

0 commit comments

Comments
 (0)