Require analyze 4.4.0, stop using deprecated APIs. (#3587)

* Require analyze 4.4.0, stop using deprecated APIs.

* Comment out 'combinators_ordering'.

Author: scheglov

analysis_options.yaml

@@ -36,7 +36,7 @@ linter:
     - cancel_subscriptions
 #    - cascade_invocations
     - cast_nullable_to_non_nullable
-    - combinators_ordering
+#    - combinators_ordering
 #    - close_sinks # https://github.com/dart-lang/linter/issues/268
     - comment_references
     - directives_ordering

lib/src/ast.dart

@@ -4,6 +4,7 @@
 
 /// Common AST helpers.
 import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/dart/ast/syntactic_entity.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/visitor.dart';
@@ -34,10 +35,10 @@ CompilationUnit? getCompilationUnit(AstNode node) =>
 
 /// Returns a field identifier with the given [name] in the given [decl]'s
 /// variable declaration list or `null` if none is found.
-SimpleIdentifier? getFieldIdentifier(FieldDeclaration decl, String name) {
+Token? getFieldName(FieldDeclaration decl, String name) {
   for (var v in decl.fields.variables) {
-    if (v.name.name == name) {
-      return v.name;
+    if (v.name2.lexeme == name) {
+      return v.name2;
     }
   }
   return null;
@@ -57,7 +58,7 @@ int? getIntValue(Expression expression, LinterContext? context) {
 }
 
 /// Returns the most specific AST node appropriate for associating errors.
-AstNode getNodeToAnnotate(Declaration node) {
+SyntacticEntity getNodeToAnnotate(Declaration node) {
   var mostSpecific = _getNodeToAnnotate(node);
   return mostSpecific ?? node;
 }
@@ -91,17 +92,17 @@ bool hasOverrideAnnotation(Element element) => element.hasOverride;
 bool inPrivateMember(AstNode node) {
   var parent = node.parent;
   if (parent is NamedCompilationUnitMember) {
-    return isPrivate(parent.name);
+    return isPrivate(parent.name2);
   }
   if (parent is ExtensionDeclaration) {
-    return parent.name == null || isPrivate(parent.name);
+    return parent.name2 == null || isPrivate(parent.name2);
   }
   return false;
 }
 
 /// Returns `true` if this element is the `==` method declaration.
 bool isEquals(ClassMember element) =>
-    element is MethodDeclaration && element.name.name == '==';
+    element is MethodDeclaration && element.name2.lexeme == '==';
 
 /// Returns `true` if the keyword associated with this token is `final` or
 /// `const`.
@@ -150,8 +151,8 @@ bool isKeyWord(String id) => Keyword.keywords.containsKey(id);
 bool isMethod(ClassMember m) => m is MethodDeclaration;
 
 /// Check if the given identifier has a private name.
-bool isPrivate(SimpleIdentifier? identifier) =>
-    identifier != null ? Identifier.isPrivateName(identifier.name) : false;
+bool isPrivate(Token? name) =>
+    name != null ? Identifier.isPrivateName(name.lexeme) : false;
 
 /// Returns `true` if the given [ClassMember] is a public method.
 bool isPublicMethod(ClassMember m) {
@@ -276,10 +277,10 @@ bool _checkForSimpleGetter(MethodDeclaration getter, Expression? expression) {
   if (expression is SimpleIdentifier) {
     var staticElement = expression.staticElement;
     if (staticElement is PropertyAccessorElement) {
-      var enclosingElement = getter.declaredElement?.enclosingElement2;
+      var enclosingElement = getter.declaredElement?.enclosingElement3;
       // Skipping library level getters, test that the enclosing element is
       // the same
-      if (staticElement.enclosingElement2 == enclosingElement) {
+      if (staticElement.enclosingElement3 == enclosingElement) {
         return staticElement.isSynthetic && staticElement.variable.isPrivate;
       }
     }
@@ -345,45 +346,45 @@ int? _getIntValue(Expression expression, LinterContext? context,
   return negated ? -value : value;
 }
 
-AstNode? _getNodeToAnnotate(Declaration node) {
+SyntacticEntity? _getNodeToAnnotate(Declaration node) {
   if (node is MethodDeclaration) {
-    return node.name;
+    return node.name2;
   }
   if (node is ConstructorDeclaration) {
-    return node.name;
+    return node.name2;
   }
   if (node is FieldDeclaration) {
     return node.fields;
   }
   if (node is ClassTypeAlias) {
-    return node.name;
+    return node.name2;
   }
   if (node is FunctionTypeAlias) {
-    return node.name;
+    return node.name2;
   }
   if (node is ClassDeclaration) {
-    return node.name;
+    return node.name2;
   }
   if (node is EnumDeclaration) {
-    return node.name;
+    return node.name2;
   }
   if (node is ExtensionDeclaration) {
-    return node.name;
+    return node.name2;
   }
   if (node is FunctionDeclaration) {
-    return node.name;
+    return node.name2;
   }
   if (node is TopLevelVariableDeclaration) {
     return node.variables;
   }
   if (node is EnumConstantDeclaration) {
-    return node.name;
+    return node.name2;
   }
   if (node is TypeParameter) {
-    return node.name;
+    return node.name2;
   }
   if (node is VariableDeclaration) {
-    return node.name;
+    return node.name2;
   }
   return null;
 }
@@ -416,8 +417,8 @@ Element? _getWriteElement(AstNode node) {
 }
 
 bool _hasFieldOrMethod(ClassMember element, String name) =>
-    (element is MethodDeclaration && element.name.name == name) ||
-    (element is FieldDeclaration && getFieldIdentifier(element, name) != null);
+    (element is MethodDeclaration && element.name2.lexeme == name) ||
+    (element is FieldDeclaration && getFieldName(element, name) != null);
 
 /// An [Element] processor function type.
 /// If `true` is returned, children of [element] will be visited.

lib/src/extensions.dart

@@ -7,6 +7,7 @@ import 'package:analyzer/dart/constant/value.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/dart/element/member.dart'; // ignore: implementation_imports
+import 'package:collection/collection.dart';
 
 import 'util/dart_type_utilities.dart';
 
@@ -127,6 +128,13 @@ extension ClassElementExtension on ClassElement {
   bool get isEnumLikeClass => asEnumLikeClass != null;
 }
 
+extension InterfaceElementExtension on InterfaceElement {
+  /// Returns whether this element is exactly [otherName] declared in
+  /// [otherLibrary].
+  bool isClass(String otherName, String otherLibrary) =>
+      name == otherName && library.name == otherLibrary;
+}
+
 extension AstNodeExtension on AstNode? {
   Element? get canonicalElement {
     var self = this;
@@ -159,16 +167,29 @@ extension BlockExtension on Block {
   }
 }
 
+extension ClassMemberListExtension on List<ClassMember> {
+  MethodDeclaration? getMethod(String name) => whereType<MethodDeclaration>()
+      .firstWhereOrNull((node) => node.name2.lexeme == name);
+}
+
 extension DartTypeExtension on DartType? {
-  bool extendsClass(String? className, String library) =>
-      _extendsClass(this, <ClassElement>{}, className, library);
+  bool extendsClass(String? className, String library) {
+    var self = this;
+    if (self is InterfaceType) {
+      return _extendsClass(self, <InterfaceElement>{}, className, library);
+    }
+    return false;
+  }
 
-  static bool _extendsClass(DartType? type, Set<ClassElement> seenTypes,
-          String? className, String? library) =>
-      type is InterfaceType &&
-      seenTypes.add(type.element) &&
+  static bool _extendsClass(
+          InterfaceType? type,
+          Set<InterfaceElement> seenElements,
+          String? className,
+          String? library) =>
+      type != null &&
+      seenElements.add(type.element2) &&
       (DartTypeUtilities.isClass(type, className, library) ||
-          _extendsClass(type.superclass, seenTypes, className, library));
+          _extendsClass(type.superclass, seenElements, className, library));
 }
 
 extension ExpressionExtension on Expression? {
@@ -179,9 +200,11 @@ extension InterfaceTypeExtension on InterfaceType {
   /// Returns the collection of all interfaces that this type implements,
   /// including itself.
   Iterable<InterfaceType> get implementedInterfaces {
-    void searchSupertypes(InterfaceType? type, Set<ClassElement> alreadyVisited,
+    void searchSupertypes(
+        InterfaceType? type,
+        Set<InterfaceElement> alreadyVisited,
         List<InterfaceType> interfaceTypes) {
-      if (type == null || !alreadyVisited.add(type.element)) {
+      if (type == null || !alreadyVisited.add(type.element2)) {
         return;
       }
       interfaceTypes.add(type);

lib/src/rules/always_declare_return_types.dart

@@ -83,26 +83,26 @@ class _Visitor extends SimpleAstVisitor<void> {
   @override
   void visitFunctionDeclaration(FunctionDeclaration node) {
     if (!node.isSetter && node.returnType == null) {
-      rule.reportLint(node.name,
-          arguments: [node.name.name], errorCode: functionCode);
+      rule.reportLintForToken(node.name2,
+          arguments: [node.name2.lexeme], errorCode: functionCode);
     }
   }
 
   @override
   void visitFunctionTypeAlias(FunctionTypeAlias node) {
     if (node.returnType == null) {
-      rule.reportLint(node.name,
-          arguments: [node.name.name], errorCode: functionCode);
+      rule.reportLintForToken(node.name2,
+          arguments: [node.name2.lexeme], errorCode: functionCode);
     }
   }
 
   @override
   void visitMethodDeclaration(MethodDeclaration node) {
     if (!node.isSetter &&
         node.returnType == null &&
-        node.name.token.type != TokenType.INDEX_EQ) {
-      rule.reportLint(node.name,
-          arguments: [node.name.name], errorCode: methodCode);
+        node.name2.type != TokenType.INDEX_EQ) {
+      rule.reportLintForToken(node.name2,
+          arguments: [node.name2.lexeme], errorCode: methodCode);
     }
   }
 }

lib/src/rules/always_put_required_named_parameters_first.dart

@@ -63,9 +63,9 @@ class _Visitor extends SimpleAstVisitor<void> {
       var element = param.declaredElement;
       if (element != null && (element.hasRequired || element.isRequiredNamed)) {
         if (nonRequiredSeen) {
-          var identifier = param.identifier;
-          if (identifier != null) {
-            rule.reportLintForToken(identifier.token);
+          var name = param.name;
+          if (name != null) {
+            rule.reportLintForToken(name);
           }
         }
       } else {

lib/src/rules/always_require_non_null_named_parameters.dart

@@ -98,10 +98,9 @@ class _Visitor extends SimpleAstVisitor<void> {
   void _checkAssert(
       Expression assertExpression, List<DefaultFormalParameter> params) {
     for (var param in params) {
-      var identifier = param.identifier;
-      if (identifier != null &&
-          _hasAssertNotNull(assertExpression, identifier.name)) {
-        rule.reportLintForToken(identifier.beginToken);
+      var name = param.name;
+      if (name != null && _hasAssertNotNull(assertExpression, name.lexeme)) {
+        rule.reportLintForToken(name);
         params.remove(param);
         return;
       }

lib/src/rules/always_specify_types.dart

@@ -129,10 +129,8 @@ class _Visitor extends SimpleAstVisitor<void> {
 
   @override
   void visitSimpleFormalParameter(SimpleFormalParameter param) {
-    var identifier = param.identifier;
-    if (identifier != null &&
-        param.type == null &&
-        !identifier.name.isJustUnderscores) {
+    var name = param.name;
+    if (name != null && param.type == null && !name.lexeme.isJustUnderscores) {
       if (param.keyword != null) {
         rule.reportLintForToken(param.keyword);
       } else {

lib/src/rules/always_use_package_imports.dart

@@ -75,7 +75,7 @@ class _Visitor extends SimpleAstVisitor<void> {
   _Visitor(this.rule);
 
   bool isRelativeImport(ImportDirective node) {
-    var uriContent = node.uriContent;
+    var uriContent = node.uri.stringValue;
     if (uriContent != null) {
       var uri = Uri.tryParse(uriContent);
       return uri != null && uri.scheme.isEmpty;

lib/src/rules/annotate_overrides.dart

@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
 import 'package:analyzer/dart/element/element.dart';
 
@@ -68,12 +69,12 @@ class _Visitor extends SimpleAstVisitor<void> {
 
   _Visitor(this.rule, this.context);
 
-  void check(Element? element, AstNode target) {
+  void check(Element? element, Token target) {
     if (element == null || element.hasOverride) return;
 
     var member = getOverriddenMember(element);
     if (member != null) {
-      rule.reportLint(target);
+      rule.reportLintForToken(target);
     }
   }
 
@@ -99,14 +100,14 @@ class _Visitor extends SimpleAstVisitor<void> {
     if (node.isStatic) return;
 
     for (var field in node.fields.variables) {
-      check(field.declaredElement, field);
+      check(field.declaredElement, field.name2);
     }
   }
 
   @override
   void visitMethodDeclaration(MethodDeclaration node) {
     if (node.isStatic) return;
 
-    check(node.declaredElement, node.name);
+    check(node.declaredElement, node.name2);
   }
 }

lib/src/rules/avoid_classes_with_only_static_members.dart

@@ -86,7 +86,7 @@ class _Visitor extends SimpleAstVisitor<void> {
     var interface = context.inheritanceManager.getInterface(declaredElement);
     var map = interface.map;
     for (var member in map.values) {
-      var enclosingElement = member.enclosingElement2;
+      var enclosingElement = member.enclosingElement3;
       if (enclosingElement is ClassElement &&
           !enclosingElement.isDartCoreObject) {
         return;