Skip to content
This repository was archived by the owner on Nov 20, 2024. It is now read-only.

Commit cbe7f4e

Browse files
srawlinssrawlins
authored
Bump to analyzer 5.1.0 and handle deprecations (#3729)
1 parent 91d8ae3 commit cbe7f4e

File tree

77 files changed

+242
-242
lines changed

Some content is hidden

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

77 files changed

+242
-242
lines changed

‎lib/src/ast.dart

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ CompilationUnit? getCompilationUnit(AstNode node) =>
3737
/// variable declaration list or `null` if none is found.
3838
Token? getFieldName(FieldDeclaration decl, String name) {
3939
for (var v in decl.fields.variables) {
40-
if (v.name2.lexeme == name) {
41-
return v.name2;
40+
if (v.name.lexeme == name) {
41+
return v.name;
4242
}
4343
}
4444
return null;
@@ -92,17 +92,17 @@ bool hasOverrideAnnotation(Element element) => element.hasOverride;
9292
bool inPrivateMember(AstNode node) {
9393
var parent = node.parent;
9494
if (parent is NamedCompilationUnitMember) {
95-
return isPrivate(parent.name2);
95+
return isPrivate(parent.name);
9696
}
9797
if (parent is ExtensionDeclaration) {
98-
return parent.name2 == null || isPrivate(parent.name2);
98+
return parent.name == null || isPrivate(parent.name);
9999
}
100100
return false;
101101
}
102102

103103
/// Returns `true` if this element is the `==` method declaration.
104104
bool isEquals(ClassMember element) =>
105-
element is MethodDeclaration && element.name2.lexeme == '==';
105+
element is MethodDeclaration && element.name.lexeme == '==';
106106

107107
/// Returns `true` if the keyword associated with this token is `final` or
108108
/// `const`.
@@ -156,7 +156,7 @@ bool isPrivate(Token? name) =>
156156

157157
/// Returns `true` if the given [ClassMember] is a public method.
158158
bool isPublicMethod(ClassMember m) {
159-
var declaredElement = m.declaredElement2;
159+
var declaredElement = m.declaredElement;
160160
return declaredElement != null && isMethod(m) && declaredElement.isPublic;
161161
}
162162

@@ -277,7 +277,7 @@ bool _checkForSimpleGetter(MethodDeclaration getter, Expression? expression) {
277277
if (expression is SimpleIdentifier) {
278278
var staticElement = expression.staticElement;
279279
if (staticElement is PropertyAccessorElement) {
280-
var enclosingElement = getter.declaredElement2?.enclosingElement3;
280+
var enclosingElement = getter.declaredElement?.enclosingElement3;
281281
// Skipping library level getters, test that the enclosing element is
282282
// the same
283283
if (staticElement.enclosingElement3 == enclosingElement) {
@@ -348,43 +348,43 @@ int? _getIntValue(Expression expression, LinterContext? context,
348348

349349
SyntacticEntity? _getNodeToAnnotate(Declaration node) {
350350
if (node is MethodDeclaration) {
351-
return node.name2;
351+
return node.name;
352352
}
353353
if (node is ConstructorDeclaration) {
354-
return node.name2;
354+
return node.name;
355355
}
356356
if (node is FieldDeclaration) {
357357
return node.fields;
358358
}
359359
if (node is ClassTypeAlias) {
360-
return node.name2;
360+
return node.name;
361361
}
362362
if (node is FunctionTypeAlias) {
363-
return node.name2;
363+
return node.name;
364364
}
365365
if (node is ClassDeclaration) {
366-
return node.name2;
366+
return node.name;
367367
}
368368
if (node is EnumDeclaration) {
369-
return node.name2;
369+
return node.name;
370370
}
371371
if (node is ExtensionDeclaration) {
372-
return node.name2;
372+
return node.name;
373373
}
374374
if (node is FunctionDeclaration) {
375-
return node.name2;
375+
return node.name;
376376
}
377377
if (node is TopLevelVariableDeclaration) {
378378
return node.variables;
379379
}
380380
if (node is EnumConstantDeclaration) {
381-
return node.name2;
381+
return node.name;
382382
}
383383
if (node is TypeParameter) {
384-
return node.name2;
384+
return node.name;
385385
}
386386
if (node is VariableDeclaration) {
387-
return node.name2;
387+
return node.name;
388388
}
389389
return null;
390390
}
@@ -417,7 +417,7 @@ Element? _getWriteElement(AstNode node) {
417417
}
418418

419419
bool _hasFieldOrMethod(ClassMember element, String name) =>
420-
(element is MethodDeclaration && element.name2.lexeme == name) ||
420+
(element is MethodDeclaration && element.name.lexeme == name) ||
421421
(element is FieldDeclaration && getFieldName(element, name) != null);
422422

423423
/// An [Element] processor function type.

‎lib/src/extensions.dart

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ extension ClassElementExtension on ClassElement {
154154

155155
extension ClassMemberListExtension on List<ClassMember> {
156156
MethodDeclaration? getMethod(String name) => whereType<MethodDeclaration>()
157-
.firstWhereOrNull((node) => node.name2.lexeme == name);
157+
.firstWhereOrNull((node) => node.name.lexeme == name);
158158
}
159159

160160
extension ConstructorElementExtension on ConstructorElement {
@@ -290,11 +290,11 @@ extension MethodDeclarationExtension on MethodDeclaration {
290290

291291
/// Returns whether this method is an override of a method in any supertype.
292292
bool get isOverride {
293-
var name = declaredElement2?.name;
293+
var name = declaredElement?.name;
294294
if (name == null) {
295295
return false;
296296
}
297-
var parentElement = declaredElement2?.enclosingElement3;
297+
var parentElement = declaredElement?.enclosingElement3;
298298
if (parentElement is! InterfaceElement) {
299299
return false;
300300
}
@@ -316,67 +316,67 @@ extension MethodDeclarationExtension on MethodDeclaration {
316316
}
317317

318318
PropertyAccessorElement? lookUpGetter() {
319-
var declaredElement = declaredElement2;
319+
var declaredElement = this.declaredElement;
320320
if (declaredElement == null) {
321321
return null;
322322
}
323323
var parent = declaredElement.enclosingElement3;
324324
if (parent is InterfaceElement) {
325-
return parent.lookUpGetter(name2.lexeme, declaredElement.library);
325+
return parent.lookUpGetter(name.lexeme, declaredElement.library);
326326
}
327327
if (parent is ExtensionElement) {
328-
return parent.getGetter(name2.lexeme);
328+
return parent.getGetter(name.lexeme);
329329
}
330330
return null;
331331
}
332332

333333
PropertyAccessorElement? lookUpInheritedConcreteGetter() {
334-
var declaredElement = declaredElement2;
334+
var declaredElement = this.declaredElement;
335335
if (declaredElement == null) {
336336
return null;
337337
}
338338
var parent = declaredElement.enclosingElement3;
339339
if (parent is InterfaceElement) {
340340
return parent.lookUpInheritedConcreteGetter(
341-
name2.lexeme, declaredElement.library);
341+
name.lexeme, declaredElement.library);
342342
}
343343
// Extensions don't inherit.
344344
return null;
345345
}
346346

347347
MethodElement? lookUpInheritedConcreteMethod() {
348-
var declaredElement = declaredElement2;
348+
var declaredElement = this.declaredElement;
349349
if (declaredElement != null) {
350350
var parent = declaredElement.enclosingElement3;
351351
if (parent is InterfaceElement) {
352352
return parent.lookUpInheritedConcreteMethod(
353-
name2.lexeme, declaredElement.library);
353+
name.lexeme, declaredElement.library);
354354
}
355355
}
356356
// Extensions don't inherit.
357357
return null;
358358
}
359359

360360
PropertyAccessorElement? lookUpInheritedConcreteSetter() {
361-
var declaredElement = declaredElement2;
361+
var declaredElement = this.declaredElement;
362362
if (declaredElement != null) {
363363
var parent = declaredElement.enclosingElement3;
364364
if (parent is InterfaceElement) {
365365
return parent.lookUpInheritedConcreteSetter(
366-
name2.lexeme, declaredElement.library);
366+
name.lexeme, declaredElement.library);
367367
}
368368
}
369369
// Extensions don't inherit.
370370
return null;
371371
}
372372

373373
MethodElement? lookUpInheritedMethod() {
374-
var declaredElement = declaredElement2;
374+
var declaredElement = this.declaredElement;
375375
if (declaredElement != null) {
376376
var parent = declaredElement.enclosingElement3;
377377
if (parent is InterfaceElement) {
378378
return parent.lookUpInheritedMethod(
379-
name2.lexeme, declaredElement.library);
379+
name.lexeme, declaredElement.library);
380380
}
381381
}
382382
return null;

‎lib/src/rules/always_declare_return_types.dart

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,26 +82,26 @@ class _Visitor extends SimpleAstVisitor<void> {
8282
@override
8383
void visitFunctionDeclaration(FunctionDeclaration node) {
8484
if (!node.isSetter && node.returnType == null) {
85-
rule.reportLintForToken(node.name2,
86-
arguments: [node.name2.lexeme], errorCode: functionCode);
85+
rule.reportLintForToken(node.name,
86+
arguments: [node.name.lexeme], errorCode: functionCode);
8787
}
8888
}
8989

9090
@override
9191
void visitFunctionTypeAlias(FunctionTypeAlias node) {
9292
if (node.returnType == null) {
93-
rule.reportLintForToken(node.name2,
94-
arguments: [node.name2.lexeme], errorCode: functionCode);
93+
rule.reportLintForToken(node.name,
94+
arguments: [node.name.lexeme], errorCode: functionCode);
9595
}
9696
}
9797

9898
@override
9999
void visitMethodDeclaration(MethodDeclaration node) {
100100
if (!node.isSetter &&
101101
node.returnType == null &&
102-
node.name2.type != TokenType.INDEX_EQ) {
103-
rule.reportLintForToken(node.name2,
104-
arguments: [node.name2.lexeme], errorCode: methodCode);
102+
node.name.type != TokenType.INDEX_EQ) {
103+
rule.reportLintForToken(node.name,
104+
arguments: [node.name.lexeme], errorCode: methodCode);
105105
}
106106
}
107107
}

‎lib/src/rules/annotate_overrides.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,14 @@ class _Visitor extends SimpleAstVisitor<void> {
9999
if (node.isStatic) return;
100100

101101
for (var field in node.fields.variables) {
102-
check(field.declaredElement2, field.name2);
102+
check(field.declaredElement, field.name);
103103
}
104104
}
105105

106106
@override
107107
void visitMethodDeclaration(MethodDeclaration node) {
108108
if (node.isStatic) return;
109109

110-
check(node.declaredElement2, node.name2);
110+
check(node.declaredElement, node.name);
111111
}
112112
}

‎lib/src/rules/avoid_classes_with_only_static_members.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class _Visitor extends SimpleAstVisitor<void> {
7777

7878
@override
7979
void visitClassDeclaration(ClassDeclaration node) {
80-
var declaredElement = node.declaredElement2;
80+
var declaredElement = node.declaredElement;
8181
if (declaredElement == null) {
8282
return;
8383
}

‎lib/src/rules/avoid_equals_and_hash_code_on_mutable_classes.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ class _Visitor extends SimpleAstVisitor<void> {
9797

9898
@override
9999
void visitMethodDeclaration(MethodDeclaration node) {
100-
if (node.name2.type == TokenType.EQ_EQ || isHashCode(node)) {
100+
if (node.name.type == TokenType.EQ_EQ || isHashCode(node)) {
101101
var classElement = _getClassForMethod(node);
102102
if (classElement != null && !_hasImmutableAnnotation(classElement)) {
103103
rule.reportLintForToken(node.firstTokenAfterCommentAndMetadata);
@@ -107,7 +107,7 @@ class _Visitor extends SimpleAstVisitor<void> {
107107

108108
ClassElement? _getClassForMethod(MethodDeclaration node) =>
109109
// todo (pq): should this be ClassOrMixinDeclaration ?
110-
node.thisOrAncestorOfType<ClassDeclaration>()?.declaredElement2;
110+
node.thisOrAncestorOfType<ClassDeclaration>()?.declaredElement;
111111

112112
bool _hasImmutableAnnotation(ClassElement clazz) {
113113
var inheritedAndSelfElements = <InterfaceElement>[

‎lib/src/rules/avoid_field_initializers_in_const_classes.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ class _Visitor extends SimpleAstVisitor<void> {
103103
// only const class
104104
var parent = node.parent;
105105
if (parent is ClassDeclaration) {
106-
var declaredElement = parent.declaredElement2;
106+
var declaredElement = parent.declaredElement;
107107
if (declaredElement == null) {
108108
return;
109109
}

‎lib/src/rules/avoid_init_to_null.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ class _Visitor extends SimpleAstVisitor<void> {
104104

105105
@override
106106
void visitVariableDeclaration(VariableDeclaration node) {
107-
var declaredElement = node.declaredElement2;
107+
var declaredElement = node.declaredElement;
108108
if (declaredElement != null &&
109109
!node.isConst &&
110110
!node.isFinal &&

‎lib/src/rules/avoid_multiple_declarations_per_line.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class _Visitor extends SimpleAstVisitor {
5555
var variables = node.variables;
5656
if (variables.length > 1) {
5757
var secondVariable = variables[1];
58-
rule.reportLintForToken(secondVariable.name2);
58+
rule.reportLintForToken(secondVariable.name);
5959
}
6060
}
6161
}

‎lib/src/rules/avoid_null_checks_in_equality_operators.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class _Visitor extends SimpleAstVisitor<void> {
124124
return;
125125
}
126126

127-
if (node.name2.type != TokenType.EQ_EQ || parameters.length != 1) {
127+
if (node.name.type != TokenType.EQ_EQ || parameters.length != 1) {
128128
return;
129129
}
130130

‎lib/src/rules/avoid_positional_boolean_parameters.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class _Visitor extends SimpleAstVisitor<void> {
6363

6464
@override
6565
void visitConstructorDeclaration(ConstructorDeclaration node) {
66-
var declaredElement = node.declaredElement2;
66+
var declaredElement = node.declaredElement;
6767
if (declaredElement != null && !declaredElement.isPrivate) {
6868
var parametersToLint =
6969
node.parameters.parameters.where(_isFormalParameterToLint);
@@ -75,7 +75,7 @@ class _Visitor extends SimpleAstVisitor<void> {
7575

7676
@override
7777
void visitFunctionDeclaration(FunctionDeclaration node) {
78-
var declaredElement = node.declaredElement2;
78+
var declaredElement = node.declaredElement;
7979
if (declaredElement != null && !declaredElement.isPrivate) {
8080
var parametersToLint = node.functionExpression.parameters?.parameters
8181
.where(_isFormalParameterToLint);
@@ -87,7 +87,7 @@ class _Visitor extends SimpleAstVisitor<void> {
8787

8888
@override
8989
void visitMethodDeclaration(MethodDeclaration node) {
90-
var declaredElement = node.declaredElement2;
90+
var declaredElement = node.declaredElement;
9191
if (declaredElement != null &&
9292
!node.isSetter &&
9393
!declaredElement.isPrivate &&

‎lib/src/rules/avoid_private_typedef_functions.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,15 @@ class _Visitor extends SimpleAstVisitor<void> {
6565

6666
@override
6767
void visitFunctionTypeAlias(FunctionTypeAlias node) {
68-
_countAndReport(node.name2);
68+
_countAndReport(node.name);
6969
}
7070

7171
@override
7272
void visitGenericTypeAlias(GenericTypeAlias node) {
7373
if (node.typeParameters != null) {
7474
return;
7575
}
76-
_countAndReport(node.name2);
76+
_countAndReport(node.name);
7777
}
7878

7979
void _countAndReport(Token identifier) {

‎lib/src/rules/avoid_renaming_method_parameters.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class _Visitor extends SimpleAstVisitor<void> {
8585
if (parentNode is! Declaration) {
8686
return;
8787
}
88-
var parentElement = parentNode.declaredElement2;
88+
var parentElement = parentNode.declaredElement;
8989
// Note: there are no override semantics with extension methods.
9090
if (parentElement is! InterfaceElement) {
9191
return;
@@ -96,7 +96,7 @@ class _Visitor extends SimpleAstVisitor<void> {
9696
if (classElement.isPrivate) return;
9797

9898
var parentMethod = classElement.lookUpInheritedMethod(
99-
node.name2.lexeme, classElement.library);
99+
node.name.lexeme, classElement.library);
100100

101101
if (parentMethod == null) return;
102102

0 commit comments

Comments
 (0)