Deprecate Element.accept2, use accept instead.

Change-Id: I4ec0389663164b8dde0b0321e4457f2ae655785a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/435745
Reviewed-by: Konstantin Shcheglov <[email protected]>
Reviewed-by: Paul Berry <[email protected]>
Commit-Queue: Paul Berry <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>

Author: fshcheglov

pkg/analysis_server/lib/src/cider/completion.dart

@@ -225,7 +225,7 @@ class CiderCompletionComputer {
     );
     var exportMap = element.exportNamespace.definedNames2;
     for (var definedElement in exportMap.values) {
-      definedElement.accept2(visitor);
+      definedElement.accept(visitor);
     }
     return suggestionBuilder.suggestions.toList();
   }

pkg/analyzer/CHANGELOG.md

@@ -72,6 +72,7 @@
 * Deprecate `DartType.element3`, use `element` instead.
 * Deprecate `LibraryElement.loadLibraryFunction2`, use `loadLibraryFunction` instead.
 * Deprecate `InterfaceType.constructors2`, use `constructors` instead.
+* Deprecate `Element.accept2`, use `accept` instead.
 
 ## 7.4.1
 * Restore `InstanceElement.augmented` getter.

pkg/analyzer/api.txt

@@ -3377,7 +3377,8 @@ package:analyzer/dart/element/element.dart:
     nonSynthetic (getter: Element)
     nonSynthetic2 (getter: Element, deprecated)
     session (getter: AnalysisSession?)
-    accept2 (method: T? Function<T>(ElementVisitor2<T>))
+    accept (method: T? Function<T>(ElementVisitor2<T>))
+    accept2 (method: T? Function<T>(ElementVisitor2<T>), deprecated)
     displayString2 (method: String Function({bool multiline, bool preferTypeAlias}))
     getExtendedDisplayName2 (method: String Function({String? shortName}))
     isAccessibleIn2 (method: bool Function(LibraryElement))

pkg/analyzer/lib/dart/element/element.dart

@@ -700,6 +700,13 @@ abstract class Element {
   ///
   /// Returns the value returned by the visitor as a result of visiting this
   /// element.
+  T? accept<T>(ElementVisitor2<T> visitor);
+
+  /// Uses the given [visitor] to visit this element.
+  ///
+  /// Returns the value returned by the visitor as a result of visiting this
+  /// element.
+  @Deprecated('Use accept instead')
   T? accept2<T>(ElementVisitor2<T> visitor);
 
   /// The presentation of this element as it should appear when presented to