Skip to content

Commit 840ea93

Browse files
authored
Merge pull request dart-archive/linter#3589 from scheglov/analyzer-4.5.0
Require analyze 4.5.0, stop using deprecated APIs.
2 parents 96ad07d + 329083d commit 840ea93

File tree

52 files changed

+111
-113
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

+111
-113
lines changed

lib/src/ast.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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.declaredElement;
159+
var declaredElement = m.declaredElement2;
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.declaredElement?.enclosingElement3;
280+
var enclosingElement = getter.declaredElement2?.enclosingElement3;
281281
// Skipping library level getters, test that the enclosing element is
282282
// the same
283283
if (staticElement.enclosingElement3 == enclosingElement) {

lib/src/extensions.dart

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -226,16 +226,12 @@ extension InterfaceTypeExtension on InterfaceType {
226226
extension MethodDeclarationExtension on MethodDeclaration {
227227
/// Returns whether this method is an override of a method in any supertype.
228228
bool get isOverride {
229-
var parent = this.parent;
230-
if (parent is! ClassOrMixinDeclaration) {
231-
return false;
232-
}
233-
var name = declaredElement?.name;
229+
var name = declaredElement2?.name;
234230
if (name == null) {
235231
return false;
236232
}
237-
var parentElement = parent.declaredElement;
238-
if (parentElement == null) {
233+
var parentElement = declaredElement2?.enclosingElement3;
234+
if (parentElement is! InterfaceElement) {
239235
return false;
240236
}
241237
var parentLibrary = parentElement.library;

lib/src/rules/annotate_overrides.dart

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

102102
for (var field in node.fields.variables) {
103-
check(field.declaredElement, field.name2);
103+
check(field.declaredElement2, field.name2);
104104
}
105105
}
106106

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

111-
check(node.declaredElement, node.name2);
111+
check(node.declaredElement2, node.name2);
112112
}
113113
}

lib/src/rules/avoid_classes_with_only_static_members.dart

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

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

lib/src/rules/avoid_equals_and_hash_code_on_mutable_classes.dart

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

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

113113
bool _hasImmutableAnnotation(ClassElement clazz) {
114114
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
@@ -104,7 +104,7 @@ class _Visitor extends SimpleAstVisitor<void> {
104104
// only const class
105105
var parent = node.parent;
106106
if (parent is ClassDeclaration) {
107-
var declaredElement = parent.declaredElement;
107+
var declaredElement = parent.declaredElement2;
108108
if (declaredElement == null) {
109109
return;
110110
}

lib/src/rules/avoid_init_to_null.dart

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

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

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.declaredElement;
66+
var declaredElement = node.declaredElement2;
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.declaredElement;
78+
var declaredElement = node.declaredElement2;
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.declaredElement;
90+
var declaredElement = node.declaredElement2;
9191
if (declaredElement != null &&
9292
!node.isSetter &&
9393
!declaredElement.isPrivate &&

lib/src/rules/avoid_renaming_method_parameters.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class _Visitor extends SimpleAstVisitor<void> {
8484
if (parentNode is! Declaration) {
8585
return;
8686
}
87-
var parentElement = parentNode.declaredElement;
87+
var parentElement = parentNode.declaredElement2;
8888
// Note: there are no override semantics with extension methods.
8989
if (parentElement is! ClassElement) {
9090
return;

lib/src/rules/avoid_returning_null.dart

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

9292
@override
9393
void visitMethodDeclaration(MethodDeclaration node) {
94-
var declaredElement = node.declaredElement;
94+
var declaredElement = node.declaredElement2;
9595
if (declaredElement != null &&
9696
_isPrimitiveType(declaredElement.returnType)) {
9797
_visitFunctionBody(node.body);

0 commit comments

Comments
 (0)