[element model] cleanup migrated ast utilities

Change-Id: I52ba518677bd0f60501bf700187a7b0509a59382
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/391493
Reviewed-by: Brian Wilkerson <[email protected]>
Auto-Submit: Phil Quitslund <[email protected]>
Commit-Queue: Phil Quitslund <[email protected]>
Commit-Queue: Brian Wilkerson <[email protected]>

Author: pq

pkg/linter/lib/src/ast.dart

@@ -23,21 +23,9 @@ import 'utils.dart';
 final List<String> reservedWords = _collectReservedWords();
 
 /// Returns direct children of [parent].
-List<Element> getChildren(Element parent, [String? name]) {
-  var children = <Element>[];
-  visitChildren(parent, (Element element) {
-    if (name == null || element.displayName == name) {
-      children.add(element);
-    }
-    return false;
-  });
-  return children;
-}
-
-/// Returns direct children of [parent].
-List<Element2> getChildren2(Element2 parent, [String? name]) {
+List<Element2> getChildren(Element2 parent, [String? name]) {
   var children = <Element2>[];
-  visitChildren2(parent, (Element2 element) {
+  visitChildren(parent, (Element2 element) {
     if (name == null || element.displayName == name) {
       children.add(element);
     }
@@ -317,14 +305,8 @@ File? locatePubspecFile(CompilationUnit compilationUnit) {
 
 /// Uses [processor] to visit all of the children of [element].
 /// If [processor] returns `true`, then children of a child are visited too.
-void visitChildren(Element element, ElementProcessor processor) {
-  element.visitChildren(_ElementVisitorAdapter(processor));
-}
-
-/// Uses [processor] to visit all of the children of [element].
-/// If [processor] returns `true`, then children of a child are visited too.
-void visitChildren2(Element2 element, ElementProcessor2 processor) {
-  element.visitChildren2(_ElementVisitorAdapter2(processor));
+void visitChildren(Element2 element, ElementProcessor processor) {
+  element.visitChildren2(_ElementVisitorAdapter(processor));
 }
 
 bool _checkForSimpleGetter(MethodDeclaration getter, Expression? expression) {
@@ -434,35 +416,16 @@ bool _hasFieldOrMethod(ClassMember element, String name) =>
     (element is MethodDeclaration && element.name.lexeme == name) ||
     (element is FieldDeclaration && getFieldName(element, name) != null);
 
-/// An [Element] processor function type.
-/// If `true` is returned, children of [element] will be visited.
-typedef ElementProcessor = bool Function(Element element);
-
-/// An [Element] processor function type.
+/// An [Element2] processor function type.
 /// If `true` is returned, children of [element] will be visited.
-typedef ElementProcessor2 = bool Function(Element2 element);
+typedef ElementProcessor = bool Function(Element2 element);
 
 /// A [GeneralizingElementVisitor] adapter for [ElementProcessor].
-class _ElementVisitorAdapter extends GeneralizingElementVisitor<void> {
+class _ElementVisitorAdapter extends GeneralizingElementVisitor2<void> {
   final ElementProcessor processor;
 
   _ElementVisitorAdapter(this.processor);
 
-  @override
-  void visitElement(Element element) {
-    var visitChildren = processor(element);
-    if (visitChildren) {
-      element.visitChildren(this);
-    }
-  }
-}
-
-/// A [GeneralizingElementVisitor] adapter for [ElementProcessor].
-class _ElementVisitorAdapter2 extends GeneralizingElementVisitor2<void> {
-  final ElementProcessor2 processor;
-
-  _ElementVisitorAdapter2(this.processor);
-
   @override
   void visitElement(Element2 element) {
     var visitChildren = processor(element);
@@ -480,13 +443,3 @@ extension AstNodeExtension on AstNode {
         self.argumentList.arguments.isNotEmpty;
   }
 }
-
-extension ElementExtension on Element? {
-  // TODO(srawlins): Move to extensions.dart.
-  bool get isDartCorePrint {
-    var self = this;
-    return self is FunctionElement &&
-        self.name == 'print' &&
-        self.library.isDartCore;
-  }
-}

pkg/linter/lib/src/extensions.dart

@@ -10,7 +10,6 @@ import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/file_system/physical_file_system.dart';
 import 'package:analyzer/src/dart/ast/ast.dart'; // ignore: implementation_imports
-import 'package:analyzer/src/dart/element/element.dart'; // ignore: implementation_imports
 import 'package:analyzer/src/dart/element/member.dart'; // ignore: implementation_imports
 import 'package:analyzer/src/dart/element/type.dart' // ignore: implementation_imports
     show
@@ -393,11 +392,6 @@ extension ElementExtension on Element {
     }
     return self;
   }
-
-  bool get isMacro {
-    var self = this;
-    return self is ClassElementImpl && self.isMacro;
-  }
 }
 
 extension ElementExtension2 on Element2? {

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

@@ -65,7 +65,7 @@ class _Visitor extends SimpleAstVisitor<void> {
     // Element should also support "isNotEmpty".
     var propertyTarget = propertyElement.enclosingElement2;
     if (propertyTarget == null ||
-        getChildren2(propertyTarget, 'isNotEmpty').isEmpty) {
+        getChildren(propertyTarget, 'isNotEmpty').isEmpty) {
       return;
     }