Elements. Switch to ElementImpl in MemberDuplicateDefinitionVerifier.

Not really the migration, but maybe this is approach that we have
to take for now.

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

Author: scheglov

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

@@ -8364,6 +8364,11 @@ class MethodElementImpl extends ExecutableElementImpl
     return displayName;
   }
 
+  @override
+  InstanceElementImpl get enclosingElement3 {
+    return super.enclosingElement3 as InstanceElementImpl;
+  }
+
   @override
   InstanceFragment? get enclosingFragment =>
       enclosingElement3 as InstanceFragment;
@@ -10020,6 +10025,11 @@ sealed class PropertyAccessorElementImpl extends ExecutableElementImpl
   @override
   PropertyAccessorElementImpl2 get element;
 
+  @override
+  ElementImpl get enclosingElement3 {
+    return super.enclosingElement3 as ElementImpl;
+  }
+
   @override
   Fragment get enclosingFragment {
     var enclosing = enclosingElement3;
@@ -10134,7 +10144,9 @@ class PropertyAccessorElementImpl_ImplicitGetter extends GetterFragmentImpl {
   }
 
   @override
-  Element get enclosingElement3 => variable2.enclosingElement3;
+  ElementImpl get enclosingElement3 {
+    return variable2.enclosingElement3 as ElementImpl;
+  }
 
   @override
   bool get hasImplicitReturnType => variable2.hasImplicitType;
@@ -10200,7 +10212,9 @@ class PropertyAccessorElementImpl_ImplicitSetter extends SetterFragmentImpl {
   }
 
   @override
-  Element get enclosingElement3 => variable2.enclosingElement3;
+  ElementImpl get enclosingElement3 {
+    return variable2.enclosingElement3 as ElementImpl;
+  }
 
   @override
   bool get isSetter => true;

pkg/analyzer/lib/src/error/duplicate_definition_verifier.dart

@@ -2,11 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// ignore_for_file: analyzer_use_new_elements
-
 import 'package:analyzer/dart/analysis/features.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/error/error.dart';
 import 'package:analyzer/error/listener.dart';
@@ -361,13 +358,13 @@ class DuplicateDefinitionVerifier {
 
 /// Information to pass from declarations to augmentations.
 class DuplicationDefinitionContext {
-  final Map<InstanceElement, _InstanceElementContext> _instanceElementContexts =
-      {};
+  final Map<InstanceElementImpl, _InstanceElementContext>
+      _instanceElementContexts = {};
 }
 
 class MemberDuplicateDefinitionVerifier {
   final InheritanceManager3 _inheritanceManager;
-  final LibraryElement _currentLibrary;
+  final LibraryElementImpl _currentLibrary;
   final CompilationUnitElementImpl _currentUnit;
   final ErrorReporter _errorReporter;
   final DuplicationDefinitionContext context;
@@ -436,7 +433,7 @@ class MemberDuplicateDefinitionVerifier {
               element: field.declaredFragment!,
               setterScope: member.isStatic ? staticSetters : instanceSetters,
             );
-            if (fragment is EnumElement) {
+            if (fragment is EnumElementImpl) {
               _checkValuesDeclarationInEnum(field.name);
             }
           }
@@ -447,7 +444,7 @@ class MemberDuplicateDefinitionVerifier {
             element: member.declaredFragment!,
             setterScope: member.isStatic ? staticSetters : instanceSetters,
           );
-          if (fragment is EnumElement) {
+          if (fragment is EnumElementImpl) {
             if (!(member.isStatic && member.isSetter)) {
               _checkValuesDeclarationInEnum(member.name);
             }
@@ -517,14 +514,14 @@ class MemberDuplicateDefinitionVerifier {
   }
 
   void _checkConflictingConstructorAndStatic({
-    required InterfaceElement interfaceElement,
-    required Map<String, Element> staticGetters,
-    required Map<String, Element> staticSetters,
+    required InterfaceElementImpl interfaceElement,
+    required Map<String, ElementImpl> staticGetters,
+    required Map<String, ElementImpl> staticSetters,
   }) {
     for (var constructor in interfaceElement.constructors) {
       var name = constructor.name;
       var staticMember = staticGetters[name] ?? staticSetters[name];
-      if (staticMember is PropertyAccessorElement) {
+      if (staticMember is PropertyAccessorElementImpl) {
         CompileTimeErrorCode errorCode;
         if (staticMember.isSynthetic) {
           errorCode =
@@ -541,7 +538,7 @@ class MemberDuplicateDefinitionVerifier {
           errorCode,
           arguments: [name],
         );
-      } else if (staticMember is MethodElement) {
+      } else if (staticMember is MethodElementImpl) {
         _errorReporter.atElement2(
           constructor.asElement2,
           CompileTimeErrorCode.CONFLICTING_CONSTRUCTOR_AND_STATIC_METHOD,
@@ -555,27 +552,27 @@ class MemberDuplicateDefinitionVerifier {
   /// in one of the scopes - [getterScope] or [setterScope], and produce an
   /// error if it is.
   void _checkDuplicateIdentifier(
-      Map<String, Element> getterScope, Token identifier,
-      {required Element element, Map<String, Element>? setterScope}) {
+      Map<String, ElementImpl> getterScope, Token identifier,
+      {required ElementImpl element, Map<String, ElementImpl>? setterScope}) {
     if (identifier.isSynthetic || element.asElement2.isWildcardVariable) {
       return;
     }
 
     switch (element) {
-      case ExecutableElement _:
+      case ExecutableElementImpl _:
         if (element.isAugmentation) return;
-      case FieldElement _:
+      case FieldElementImpl _:
         if (element.isAugmentation) return;
-      case InstanceElement _:
+      case InstanceElementImpl _:
         if (element.isAugmentation) return;
-      case TypeAliasElement _:
+      case TypeAliasElementImpl _:
         if (element.isAugmentation) return;
-      case TopLevelVariableElement _:
+      case TopLevelVariableElementImpl _:
         if (element.isAugmentation) return;
     }
 
     // Fields define getters and setters, so check them separately.
-    if (element is PropertyInducingElement) {
+    if (element is PropertyInducingElementImpl) {
       _checkDuplicateIdentifier(getterScope, identifier,
           element: element.getter!, setterScope: setterScope);
       var setter = element.setter;
@@ -587,7 +584,7 @@ class MemberDuplicateDefinitionVerifier {
     }
 
     var name = switch (element) {
-      MethodElement() => element.name,
+      MethodElementImpl() => element.name,
       _ => identifier.lexeme,
     };
 
@@ -608,7 +605,7 @@ class MemberDuplicateDefinitionVerifier {
     }
 
     if (setterScope != null) {
-      if (element is PropertyAccessorElement && element.isSetter) {
+      if (element is PropertyAccessorElementImpl && element.isSetter) {
         previous = setterScope[name];
         if (previous != null) {
           _errorReporter.reportError(
@@ -665,7 +662,7 @@ class MemberDuplicateDefinitionVerifier {
       }
       var baseName = accessor.displayName;
       var inherited = _getInheritedMember(firstFragment, baseName);
-      if (inherited is MethodElement) {
+      if (inherited is MethodElementImpl) {
         _errorReporter.atElement2(
           accessor.asElement2,
           CompileTimeErrorCode.CONFLICTING_FIELD_AND_METHOD,
@@ -687,7 +684,7 @@ class MemberDuplicateDefinitionVerifier {
       }
       var baseName = method.displayName;
       var inherited = _getInheritedMember(firstFragment, baseName);
-      if (inherited is PropertyAccessorElement) {
+      if (inherited is PropertyAccessorElementImpl) {
         _errorReporter.atElement2(
           method.asElement2,
           CompileTimeErrorCode.CONFLICTING_METHOD_AND_FIELD,
@@ -862,13 +859,13 @@ class MemberDuplicateDefinitionVerifier {
     }
   }
 
-  _InstanceElementContext _getElementContext(InstanceElement element) {
+  _InstanceElementContext _getElementContext(InstanceElementImpl element) {
     return context._instanceElementContexts[element] ??=
         _InstanceElementContext();
   }
 
-  ExecutableElement? _getInheritedMember(
-      InterfaceElement element, String baseName) {
+  ExecutableElementOrMember? _getInheritedMember(
+      InterfaceElementImpl element, String baseName) {
     var libraryUri = _currentLibrary.source.uri;
 
     var getterName = Name(libraryUri, baseName);
@@ -881,8 +878,8 @@ class MemberDuplicateDefinitionVerifier {
     return _inheritanceManager.getInherited2(element, setterName);
   }
 
-  ExecutableElement? _getInterfaceMember(
-      InterfaceElement element, String baseName) {
+  ExecutableElementOrMember? _getInterfaceMember(
+      InterfaceElementImpl element, String baseName) {
     var libraryUri = _currentLibrary.source.uri;
 
     var getterName = Name(libraryUri, baseName);
@@ -898,7 +895,7 @@ class MemberDuplicateDefinitionVerifier {
   static void checkLibrary({
     required InheritanceManager3 inheritance,
     required LibraryVerificationContext libraryVerificationContext,
-    required LibraryElement libraryElement,
+    required LibraryElementImpl libraryElement,
     required Map<FileState, FileAnalysis> files,
   }) {
     MemberDuplicateDefinitionVerifier forUnit(FileAnalysis fileAnalysis) {
@@ -922,8 +919,8 @@ class MemberDuplicateDefinitionVerifier {
     }
   }
 
-  static bool _isGetterSetterPair(Element a, Element b) {
-    if (a is PropertyAccessorElement && b is PropertyAccessorElement) {
+  static bool _isGetterSetterPair(ElementImpl a, ElementImpl b) {
+    if (a is PropertyAccessorElementImpl && b is PropertyAccessorElementImpl) {
       return a.isGetter && b.isSetter || a.isSetter && b.isGetter;
     }
     return false;
@@ -933,8 +930,8 @@ class MemberDuplicateDefinitionVerifier {
 /// Information accumulated for a single declaration and its augmentations.
 class _InstanceElementContext {
   final Set<String> constructorNames = {};
-  final Map<String, Element> instanceGetters = {};
-  final Map<String, Element> instanceSetters = {};
-  final Map<String, Element> staticGetters = {};
-  final Map<String, Element> staticSetters = {};
+  final Map<String, ElementImpl> instanceGetters = {};
+  final Map<String, ElementImpl> instanceSetters = {};
+  final Map<String, ElementImpl> staticGetters = {};
+  final Map<String, ElementImpl> staticSetters = {};
 }

pkg/analyzer/lib/src/summary2/bundle_writer.dart

@@ -1006,8 +1006,7 @@ class ResolutionSink extends _SummaryDataWriter {
 
     var enclosing = declaration.enclosingElement3;
     if (enclosing is InstanceElement) {
-      var typeParameters =
-          (enclosing.asElement2! as InstanceElement2).typeParameters2;
+      var typeParameters = enclosing.asElement2.typeParameters2;
       if (typeParameters.isEmpty) {
         return const <DartType>[];
       }

pkg/analyzer/lib/src/utilities/extensions/element.dart

@@ -409,6 +409,12 @@ extension ExtensionElementExtension on ExtensionElement {
   }
 }
 
+extension ExtensionElementImplExtension on ExtensionElementImpl {
+  ExtensionElementImpl2 get asElement2 {
+    return element;
+  }
+}
+
 extension ExtensionTypeElement2Extension on ExtensionTypeElement2 {
   ExtensionTypeElement get asElement {
     return firstFragment as ExtensionTypeElement;
@@ -487,6 +493,18 @@ extension InstanceElement2Extension on InstanceElement2 {
   }
 }
 
+extension InstanceElementExtension on InstanceElement {
+  InstanceElement2 get asElement2 {
+    return (this as InstanceElementImpl).element;
+  }
+}
+
+extension InstanceElementImplExtension on InstanceElementImpl {
+  InstanceElementImpl2 get asElement2 {
+    return element;
+  }
+}
+
 extension InterfaceElement2Extension on InterfaceElement2 {
   InterfaceElement get asElement {
     return firstFragment as InterfaceElement;