Elements. Migrate ResolverVisitor.enclosingExtension

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

Author: scheglov

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

@@ -6481,8 +6481,7 @@ final class ExtensionDeclarationImpl extends CompilationUnitMemberImpl
 
   @experimental
   @override
-  ExtensionFragment? get declaredFragment =>
-      declaredElement as ExtensionFragment?;
+  ExtensionElementImpl? get declaredFragment => declaredElement;
 
   @override
   Token get endToken => rightBracket;
@@ -8319,11 +8318,8 @@ final class FunctionDeclarationImpl extends NamedCompilationUnitMemberImpl
 
   @experimental
   @override
-  ExecutableFragment? get declaredFragment {
-    if (declaredElement case ExecutableFragment fragment) {
-      return fragment;
-    }
-    return null;
+  ExecutableElementImpl? get declaredFragment {
+    return declaredElement;
   }
 
   @override
@@ -11910,8 +11906,7 @@ final class MethodDeclarationImpl extends ClassMemberImpl
 
   @experimental
   @override
-  ExecutableFragment? get declaredFragment =>
-      declaredElement as ExecutableFragment?;
+  ExecutableElementImpl? get declaredFragment => declaredElement;
 
   @override
   Token get endToken => body.endToken;

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

@@ -3761,6 +3761,9 @@ abstract class ExecutableElementImpl extends _ExistingElementImpl
         ...parameters,
       ];
 
+  @override
+  ExecutableElementImpl2 get element;
+
   @override
   Element get enclosingElement3 {
     return super.enclosingElement3!;
@@ -5247,7 +5250,7 @@ class FunctionElementImpl extends ExecutableElementImpl
   // TODO(brianwilkerson): Use either `LocalFunctionElement` or
   //  `TopLevelFunctionElement` when this class is split.
   @override
-  late ExecutableElement2 element;
+  late ExecutableElementImpl2 element;
 
   /// Initialize a newly created function element to have the given [name] and
   /// [offset].

pkg/analyzer/lib/src/dart/resolver/function_expression_resolver.dart

@@ -165,8 +165,7 @@ class FunctionExpressionResolver {
   }
 
   void _resolve2(FunctionExpressionImpl node, DartType? imposedType) {
-    var functionElement =
-        node.declaredFragment!.element as ExecutableElementImpl2;
+    var functionElement = node.declaredFragment!.element;
 
     if (_shouldUpdateReturnType(node)) {
       var firstFragment =

pkg/analyzer/lib/src/generated/resolver.dart

@@ -176,7 +176,7 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
 
   /// The element representing the extension containing the AST nodes being
   /// visited, or `null` if we are not in the scope of an extension.
-  ExtensionElementImpl? enclosingExtension;
+  ExtensionElementImpl2? enclosingExtension;
 
   /// The element representing the function containing the current node, or
   /// `null` if the current node is not contained in a function.
@@ -1350,7 +1350,7 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
     }
 
     if (parent is ExtensionDeclarationImpl) {
-      enclosingExtension = parent.declaredElement!;
+      enclosingExtension = parent.declaredFragment!.element;
       return true;
     }
 
@@ -2672,7 +2672,7 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
   void visitExtensionDeclaration(covariant ExtensionDeclarationImpl node) {
     var outerExtension = enclosingExtension;
     try {
-      enclosingExtension = node.declaredElement!;
+      enclosingExtension = node.declaredFragment!.element;
       checkUnreachableNode(node);
       node.visitChildren(this);
       elementResolver.visitExtensionDeclaration(node);

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

@@ -107,6 +107,12 @@ extension ConstructorElementExtension on ConstructorElement {
   }
 }
 
+extension ConstructorElementImplExtension on ConstructorElementImpl {
+  ConstructorElementImpl2 get asElement2 {
+    return element;
+  }
+}
+
 extension Element2Extension on Element2 {
   /// Whether the element is effectively [internal].
   bool get isInternal {
@@ -352,6 +358,12 @@ extension ExecutableElementExtension on ExecutableElement {
   }
 }
 
+extension ExecutableElementImplExtension on ExecutableElementImpl {
+  ExecutableElementImpl2 get asElement2 {
+    return element;
+  }
+}
+
 extension ExecutableElementOrNullExtension on ExecutableElement? {
   ExecutableElement2? get asElement2 {
     return this?.asElement2;
@@ -623,6 +635,12 @@ extension PropertyAccessorElementExtension on PropertyAccessorElement {
   }
 }
 
+extension PropertyAccessorElementImplExtension on PropertyAccessorElementImpl {
+  PropertyAccessorElementImpl2 get asElement2 {
+    return element;
+  }
+}
+
 extension PropertyAccessorElementOrMemberExtension
     on PropertyAccessorElementOrMember {
   PropertyAccessorElement2OrMember get asElement2 {