Rename XyzElementImpl2 to XyzElementImpl.

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

Author: fshcheglov

pkg/analysis_server/lib/src/services/completion/dart/declaration_helper.dart

@@ -568,7 +568,7 @@ class DeclarationHelper {
   /// containing the [node] that can be referenced as a super parameter.
   void addParametersFromSuperConstructor(SuperFormalParameter node) {
     var element = node.declaredFragment?.element;
-    if (element is! SuperFormalParameterElementImpl2) {
+    if (element is! SuperFormalParameterElementImpl) {
       return;
     }
 
@@ -578,7 +578,7 @@ class DeclarationHelper {
     }
 
     var constructorElement = constructor.declaredFragment?.element;
-    if (constructorElement is! ConstructorElementImpl2) {
+    if (constructorElement is! ConstructorElementImpl) {
       return;
     }
 

pkg/analysis_server/test/plugin/protocol_dart_test.dart

@@ -131,7 +131,7 @@ class A {
   }
 
   void test_dynamic() {
-    var engineElement = engine.DynamicElementImpl2.instance;
+    var engineElement = engine.DynamicElementImpl.instance;
     // create notification Element
     var element = convertElement(engineElement);
     expect(element.kind, ElementKind.UNKNOWN);

pkg/analysis_server/test/services/refactoring/agnostic/change_method_signature_test.dart

@@ -117,7 +117,7 @@ class AbstractChangeMethodSignatureTest extends AbstractContextTest {
   String _elementToReferenceString(Element element) {
     var enclosingElement = element.enclosingElement;
     var reference = switch (element) {
-      ElementImpl2() =>
+      ElementImpl() =>
         element.reference ?? (element.firstFragment as FragmentImpl).reference,
       _ => null,
     };

pkg/analyzer/lib/src/dart/analysis/driver.dart

@@ -67,7 +67,7 @@ import 'package:meta/meta.dart';
 
 /// This function is used to test recording requirements during analysis.
 ///
-/// Some [ElementImpl2] APIs are not trivial, or maybe even impossible, to
+/// Some [ElementImpl] APIs are not trivial, or maybe even impossible, to
 /// trigger. For example because this API is not used during normal resolution
 /// of Dart code, but can be used by a linter rule.
 @visibleForTesting

pkg/analyzer/lib/src/dart/analysis/index.dart

@@ -374,15 +374,15 @@ class _IndexAssembler {
 
   /// Adds a prefix (or empty string for unprefixed) for an element.
   void addPrefixForElement(Element element, {PrefixElement? prefix}) {
-    if (element is MultiplyDefinedElementImpl2 ||
+    if (element is MultiplyDefinedElementImpl ||
         // TODO(brianwilkerson): The last two conditions are here because the
         //  elements for `dynamic` and `Never` are singletons and hence don't have
         //  a parent element for which we can find an `_ElementInfo`. This means
         //  that any reference to either type via a prefix can't be stored in the
         //  index. The solution is to make those elements be normal (not unique)
         //  elements.
-        element is DynamicElementImpl2 ||
-        element is NeverElementImpl2) {
+        element is DynamicElementImpl ||
+        element is NeverElementImpl) {
       return;
     }
 
@@ -734,7 +734,7 @@ class _IndexContributor extends GeneralizingAstVisitor {
     // implicitly invokes the default super constructor. Associate the
     // invocation with the name of the class.
     var defaultConstructor = declaredElement.constructors.singleOrNull;
-    if (defaultConstructor is ConstructorElementImpl2 &&
+    if (defaultConstructor is ConstructorElementImpl &&
         defaultConstructor.isSynthetic) {
       defaultConstructor.isDefaultConstructor;
       var superConstructor = defaultConstructor.superConstructor2;
@@ -1260,7 +1260,7 @@ class _IndexContributor extends GeneralizingAstVisitor {
   @override
   visitSuperFormalParameter(SuperFormalParameter node) {
     var element = node.declaredFragment!.element;
-    if (element is SuperFormalParameterElementImpl2) {
+    if (element is SuperFormalParameterElementImpl) {
       var superParameter = element.superConstructorParameter2;
       if (superParameter != null) {
         recordRelation(
@@ -1377,9 +1377,9 @@ class _IndexContributor extends GeneralizingAstVisitor {
     ConstructorElement? constructor,
   ) {
     var seenConstructors = <ConstructorElement?>{};
-    while (constructor is ConstructorElementImpl2 && constructor.isSynthetic) {
+    while (constructor is ConstructorElementImpl && constructor.isSynthetic) {
       var enclosing = constructor.enclosingElement;
-      if (enclosing is ClassElementImpl2 && enclosing.isMixinApplication) {
+      if (enclosing is ClassElementImpl && enclosing.isMixinApplication) {
         var superInvocation =
             constructor.firstFragment.constantInitializers
                 .whereType<SuperConstructorInvocation>()

pkg/analyzer/lib/src/dart/analysis/search.dart

@@ -417,7 +417,7 @@ class Search {
       return _searchReferences_Local(element, (n) => n is Block, searchedFiles);
     } else if (element is ExecutableElement) {
       return _searchReferences_Function(element, searchedFiles);
-    } else if (element is PatternVariableElementImpl2) {
+    } else if (element is PatternVariableElementImpl) {
       return _searchReferences_PatternVariable(element, searchedFiles);
     } else if (kind == ElementKind.LABEL ||
         kind == ElementKind.LOCAL_VARIABLE) {
@@ -436,7 +436,7 @@ class Search {
       return _searchReferences_Library(element, searchedFiles);
     } else if (element is FormalParameterElement) {
       return _searchReferences_Parameter(element, searchedFiles);
-    } else if (element is PrefixElementImpl2) {
+    } else if (element is PrefixElementImpl) {
       return _searchReferences_Prefix(element, searchedFiles);
     } else if (element is TypeParameterElement) {
       return _searchReferences_Local(
@@ -953,7 +953,7 @@ class Search {
   }
 
   Future<List<SearchResult>> _searchReferences_PatternVariable(
-    PatternVariableElementImpl2 element,
+    PatternVariableElementImpl element,
     SearchedFiles searchedFiles,
   ) async {
     String path = element.firstFragment.libraryFragment.source.fullName;
@@ -963,14 +963,14 @@ class Search {
 
     var rootVariable = element.rootVariable;
     var transitiveVariables =
-        rootVariable is JoinPatternVariableElementImpl2
+        rootVariable is JoinPatternVariableElementImpl
             ? rootVariable.transitiveVariables
             : [rootVariable];
 
     // Prepare a binding element for the variable.
     var bindElement =
         transitiveVariables
-            .whereType<BindPatternVariableElementImpl2>()
+            .whereType<BindPatternVariableElementImpl>()
             .firstOrNull;
     if (bindElement == null) {
       return const <SearchResult>[];
@@ -994,7 +994,7 @@ class Search {
   }
 
   Future<List<SearchResult>> _searchReferences_Prefix(
-    PrefixElementImpl2 element,
+    PrefixElementImpl element,
     SearchedFiles searchedFiles,
   ) async {
     String path = element.firstFragment.libraryFragment.source.fullName;

pkg/analyzer/lib/src/dart/ast/ast.dart

@@ -1058,7 +1058,7 @@ final class AssignedVariablePatternImpl extends VariablePatternImpl
   @override
   TypeImpl computePatternSchema(ResolverVisitor resolverVisitor) {
     var element = element2;
-    if (element is PromotableElementImpl2) {
+    if (element is PromotableElementImpl) {
       return resolverVisitor
           .analyzeAssignedVariablePatternSchema(element)
           .unwrapTypeSchemaView();
@@ -3365,7 +3365,7 @@ final class CatchClauseParameterImpl extends AstNodeImpl
   }
 
   @override
-  LocalVariableElementImpl2? get declaredElement2 {
+  LocalVariableElementImpl? get declaredElement2 {
     return declaredFragment?.element;
   }
 
@@ -6232,7 +6232,7 @@ final class DeclaredIdentifierImpl extends DeclarationImpl
 
   @experimental
   @override
-  LocalVariableElementImpl2? get declaredElement2 {
+  LocalVariableElementImpl? get declaredElement2 {
     return declaredFragment?.element;
   }
 
@@ -6370,7 +6370,7 @@ final class DeclaredVariablePatternImpl extends VariablePatternImpl
 
   @experimental
   @override
-  BindPatternVariableElementImpl2? get declaredElement2 {
+  BindPatternVariableElementImpl? get declaredElement2 {
     return declaredFragment?.element;
   }
 
@@ -6853,7 +6853,7 @@ final class DotShorthandConstructorInvocationImpl
   SimpleIdentifierImpl _constructorName;
 
   @override
-  ConstructorElementImpl2? element;
+  ConstructorElementImpl? element;
 
   @generated
   DotShorthandConstructorInvocationImpl({
@@ -8991,7 +8991,7 @@ abstract final class ExtensionOverride implements Expression {
     GenerateNodeProperty('name'),
     GenerateNodeProperty('typeArguments'),
     GenerateNodeProperty('argumentList'),
-    GenerateNodeProperty('element2', type: ExtensionElementImpl2),
+    GenerateNodeProperty('element2', type: ExtensionElementImpl),
   ],
 )
 final class ExtensionOverrideImpl extends ExpressionImpl
@@ -9011,7 +9011,7 @@ final class ExtensionOverrideImpl extends ExpressionImpl
 
   @generated
   @override
-  final ExtensionElementImpl2 element2;
+  final ExtensionElementImpl element2;
 
   @override
   List<DartType>? typeArgumentTypes;
@@ -12654,7 +12654,7 @@ final class GuardedPatternImpl extends AstNodeImpl implements GuardedPattern {
 
   /// Variables declared in [pattern], available in [whenClause] guard, and
   /// to the `ifTrue` node.
-  late Map<String, PatternVariableElementImpl2> variables;
+  late Map<String, PatternVariableElementImpl> variables;
 
   @generated
   GuardedPatternImpl({
@@ -14965,7 +14965,7 @@ final class LabelImpl extends AstNodeImpl implements Label {
 
   @override
   LabelFragmentImpl? get declaredFragment =>
-      (label.element as LabelElementImpl2?)?.firstFragment;
+      (label.element as LabelElementImpl?)?.firstFragment;
 
   @generated
   @override
@@ -19290,7 +19290,7 @@ final class PatternVariableDeclarationImpl extends AnnotatedNodeImpl
   TypeImpl? patternTypeSchema;
 
   /// Variables declared in [pattern].
-  late final List<BindPatternVariableElementImpl2> elements;
+  late final List<BindPatternVariableElementImpl> elements;
 
   @generated
   PatternVariableDeclarationImpl({
@@ -20802,7 +20802,7 @@ final class RedirectingConstructorInvocationImpl
   ArgumentListImpl _argumentList;
 
   @override
-  ConstructorElementImpl2? element;
+  ConstructorElementImpl? element;
 
   @generated
   RedirectingConstructorInvocationImpl({
@@ -23804,7 +23804,7 @@ class SwitchStatementCaseGroup {
   final bool hasLabels;
 
   /// Joined variables declared in [members], available in [statements].
-  late Map<String, PromotableElementImpl2> variables;
+  late Map<String, PromotableElementImpl> variables;
 
   SwitchStatementCaseGroup(this.members, this.hasLabels);
 
@@ -25214,8 +25214,8 @@ final class VariableDeclarationImpl extends DeclarationImpl
 
   @experimental
   @override
-  LocalVariableElementImpl2? get declaredElement2 {
-    return declaredFragment?.element.ifTypeOrNull<LocalVariableElementImpl2>();
+  LocalVariableElementImpl? get declaredElement2 {
+    return declaredFragment?.element.ifTypeOrNull<LocalVariableElementImpl>();
   }
 
   /// This overridden implementation of [documentationComment] looks in the

pkg/analyzer/lib/src/dart/constant/evaluation.dart

@@ -327,7 +327,7 @@ class ConstantEvaluationEngine {
         // The annotation is a reference to a compile-time constant variable,
         // so it depends on the variable.
         if (element.variable3 case var variable?) {
-          var baseElement = variable.baseElement as VariableElementImpl2;
+          var baseElement = variable.baseElement as VariableElementImpl;
           callback(baseElement.firstFragment as VariableFragmentImpl);
         }
       } else if (element is ConstructorElement) {
@@ -863,7 +863,7 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
     var typeElement = node.constructorName.type.element2;
 
     TypeAliasElement? viaTypeAlias;
-    if (typeElement is TypeAliasElementImpl2) {
+    if (typeElement is TypeAliasElementImpl) {
       if (constructorFunctionType.typeFormals.isNotEmpty &&
           !typeElement.isProperRename) {
         // The type alias is not a proper rename of the aliased class, so
@@ -875,7 +875,7 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
 
     var constructorElement =
         node.constructorName.element?.baseElement
-            .ifTypeOrNull<ConstructorElementImpl2>();
+            .ifTypeOrNull<ConstructorElementImpl>();
     if (constructorElement == null) {
       return InvalidConstant.forEntity(
         entity: node,
@@ -1952,7 +1952,7 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
       );
     }
 
-    if (variableElement is VariableElementImpl2) {
+    if (variableElement is VariableElementImpl) {
       // We access values of constant variables here in two cases: when we
       // compute values of other constant variables, or when we compute values
       // and errors for other constant expressions. In either case we have
@@ -1992,14 +1992,14 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
             );
         }
       }
-    } else if (variableElement is ConstructorElementImpl2 &&
+    } else if (variableElement is ConstructorElementImpl &&
         expression != null) {
       return DartObjectImpl(
         typeSystem,
         expression.typeOrThrow,
         FunctionState(variableElement),
       );
-    } else if (variableElement is ExecutableElementImpl2) {
+    } else if (variableElement is ExecutableElementImpl) {
       if (variableElement.isStatic) {
         var rawType = DartObjectImpl(
           typeSystem,
@@ -2014,7 +2014,7 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
         }
         return _instantiateFunctionTypeForSimpleIdentifier(identifier, rawType);
       }
-    } else if (variableElement is InterfaceElementImpl2) {
+    } else if (variableElement is InterfaceElementImpl) {
       var type =
           givenType ??
           variableElement.instantiateImpl(
@@ -2029,13 +2029,13 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
         _typeProvider.typeType,
         TypeState(type),
       );
-    } else if (variableElement is DynamicElementImpl2) {
+    } else if (variableElement is DynamicElementImpl) {
       return DartObjectImpl(
         typeSystem,
         _typeProvider.typeType,
         TypeState(_typeProvider.dynamicType),
       );
-    } else if (variableElement is TypeAliasElementImpl2) {
+    } else if (variableElement is TypeAliasElementImpl) {
       var type =
           givenType ??
           variableElement.instantiate(
@@ -2050,7 +2050,7 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
         _typeProvider.typeType,
         TypeState(type),
       );
-    } else if (variableElement is NeverElementImpl2) {
+    } else if (variableElement is NeverElementImpl) {
       return DartObjectImpl(
         typeSystem,
         _typeProvider.typeType,

pkg/analyzer/lib/src/dart/constant/utilities.dart

@@ -261,7 +261,7 @@ class ReferenceFinder extends RecursiveAstVisitor<void> {
       element = element.variable3;
     }
 
-    if (element is VariableElementImpl2 && element.isConst) {
+    if (element is VariableElementImpl && element.isConst) {
       _callback(element.firstFragment as VariableFragmentImpl);
     }
   }

pkg/analyzer/lib/src/dart/constant/value.dart

@@ -1403,7 +1403,7 @@ class EvaluationException {
 /// The state of an object representing a function.
 class FunctionState extends InstanceState {
   /// The element representing the function being modeled.
-  final ExecutableElementImpl2 element;
+  final ExecutableElementImpl element;
 
   final List<TypeImpl>? typeArguments;