[element model] migrate ast utils

Bug: #59548
Change-Id: Ibb2abbebcac8b360669f16ae344b45a4763dfee2
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/398603
Auto-Submit: Phil Quitslund <[email protected]>
Commit-Queue: Phil Quitslund <[email protected]>
Reviewed-by: Konstantin Shcheglov <[email protected]>

Author: pq

pkg/linter/analyzer_use_new_elements.txt

@@ -1,4 +1,3 @@
-lib/src/ast.dart
 lib/src/extensions.dart
 lib/src/rules/deprecated_member_use_from_same_package.dart
 lib/src/rules/invalid_runtime_check_with_js_interop_types.dart

pkg/linter/lib/src/ast.dart

@@ -8,7 +8,6 @@ library;
 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/element2.dart';
 import 'package:analyzer/dart/element/visitor.dart';
 import 'package:analyzer/dart/element/visitor2.dart';
@@ -118,22 +117,11 @@ SyntacticEntity getNodeToAnnotate(Declaration node) {
   return node;
 }
 
-/// If the [node] is the finishing identifier of an assignment, return its
-/// "writeElement", otherwise return its "staticElement", which might be
-/// thought as the "readElement".
-Element? getWriteOrReadElement(SimpleIdentifier node) {
-  var writeElement = _getWriteElement(node);
-  if (writeElement != null) {
-    return writeElement;
-  }
-  return node.staticElement;
-}
-
 /// If the [node] is the finishing identifier of an assignment, return its
 /// "writeElement", otherwise return its "element", which might be
 /// thought as the "readElement".
-Element2? getWriteOrReadElement2(SimpleIdentifier node) =>
-    _getWriteElement2(node) ?? node.element;
+Element2? getWriteOrReadElement(SimpleIdentifier node) =>
+    _getWriteElement(node) ?? node.element;
 
 bool hasConstantError(Expression node) =>
     node.computeConstantValue().errors.isNotEmpty;
@@ -196,7 +184,7 @@ bool isMethod(ClassMember m) => m is MethodDeclaration;
 
 /// Returns `true` if the given [ClassMember] is a public method.
 bool isPublicMethod(ClassMember m) {
-  var declaredElement = m.declaredElement;
+  var declaredElement = m.declaredFragment?.element;
   return declaredElement != null && isMethod(m) && declaredElement.isPublic;
 }
 
@@ -390,30 +378,7 @@ int? _getIntValue(Expression expression, LinterContext? context,
 /// return the corresponding "writeElement", which is the local variable,
 /// the setter referenced with a [SimpleIdentifier] or a [PropertyAccess],
 /// or the `[]=` operator.
-Element? _getWriteElement(AstNode node) {
-  var parent = node.parent;
-  if (parent is AssignmentExpression && parent.leftHandSide == node) {
-    return parent.writeElement;
-  }
-  if (parent is PostfixExpression) {
-    return parent.writeElement;
-  }
-  if (parent is PrefixExpression) {
-    return parent.writeElement;
-  }
-
-  if (parent is PrefixedIdentifier && parent.identifier == node) {
-    return _getWriteElement(parent);
-  }
-
-  if (parent is PropertyAccess && parent.propertyName == node) {
-    return _getWriteElement(parent);
-  }
-
-  return null;
-}
-
-Element2? _getWriteElement2(AstNode node) {
+Element2? _getWriteElement(AstNode node) {
   var parent = node.parent;
   if (parent is AssignmentExpression && parent.leftHandSide == node) {
     return parent.writeElement2;
@@ -426,11 +391,11 @@ Element2? _getWriteElement2(AstNode node) {
   }
 
   if (parent is PrefixedIdentifier && parent.identifier == node) {
-    return _getWriteElement2(parent);
+    return _getWriteElement(parent);
   }
 
   if (parent is PropertyAccess && parent.propertyName == node) {
-    return _getWriteElement2(parent);
+    return _getWriteElement(parent);
   }
 
   return null;

pkg/linter/lib/src/rules/prefer_asserts_in_initializer_lists.dart

@@ -40,7 +40,7 @@ class _AssertVisitor extends RecursiveAstVisitor<void> {
 
   @override
   void visitSimpleIdentifier(SimpleIdentifier node) {
-    var element = getWriteOrReadElement2(node);
+    var element = getWriteOrReadElement(node);
 
     // use method
     needInstance = needInstance ||

pkg/linter/lib/src/rules/unnecessary_this.dart

@@ -51,7 +51,7 @@ class _Visitor extends SimpleAstVisitor<void> {
 
     Element2? element;
     if (parent is PropertyAccess && !parent.isNullAware) {
-      element = getWriteOrReadElement2(parent.propertyName);
+      element = getWriteOrReadElement(parent.propertyName);
     } else if (parent is MethodInvocation && !parent.isNullAware) {
       element = parent.methodName.element;
     } else {

pkg/linter/lib/src/util/dart_type_utilities.dart

@@ -4,6 +4,7 @@
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/dart/element/type.dart'; // ignore: implementation_imports
 
@@ -66,6 +67,9 @@ bool argumentsMatchParameters(
 bool canonicalElementsAreEqual(Element? element1, Element? element2) =>
     element1?.canonicalElement == element2?.canonicalElement;
 
+bool canonicalElementsAreEqual2(Element2? element1, Element2? element2) =>
+    element1?.canonicalElement2 == element2?.canonicalElement2;
+
 /// Returns whether the canonical elements from two nodes are equal.
 ///
 /// As in, [AstNodeNullableExtension.canonicalElement], the two nodes must be
@@ -100,23 +104,24 @@ bool canonicalElementsFromIdentifiersAreEqual(
 
   if (expression1 is SimpleIdentifier) {
     return expression2 is SimpleIdentifier &&
-        canonicalElementsAreEqual(getWriteOrReadElement(expression1),
+        canonicalElementsAreEqual2(getWriteOrReadElement(expression1),
             getWriteOrReadElement(expression2));
   }
 
   if (expression1 is PrefixedIdentifier) {
     return expression2 is PrefixedIdentifier &&
         canonicalElementsAreEqual(expression1.prefix.staticElement,
             expression2.prefix.staticElement) &&
-        canonicalElementsAreEqual(getWriteOrReadElement(expression1.identifier),
+        canonicalElementsAreEqual2(
+            getWriteOrReadElement(expression1.identifier),
             getWriteOrReadElement(expression2.identifier));
   }
 
   if (expression1 is PropertyAccess && expression2 is PropertyAccess) {
     var target1 = expression1.target;
     var target2 = expression2.target;
     return canonicalElementsFromIdentifiersAreEqual(target1, target2) &&
-        canonicalElementsAreEqual(
+        canonicalElementsAreEqual2(
             getWriteOrReadElement(expression1.propertyName),
             getWriteOrReadElement(expression2.propertyName));
   }