Elements. Migrate ResolverVisitor.enclosingFunction

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

Author: scheglov

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

@@ -208,7 +208,7 @@ class SimpleIdentifierResolver with ScopeHelpers {
       }
     } else if (element == null) {
       // TODO(brianwilkerson): Recover from this error.
-      if (node.name == "await" && _resolver.enclosingFunction2 != null) {
+      if (node.name == "await" && _resolver.enclosingFunction != null) {
         errorReporter.atNode(
           node,
           CompileTimeErrorCode.UNDEFINED_IDENTIFIER_AWAIT,

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

@@ -96,8 +96,8 @@ class ElementResolver {
   /// Return `true` iff the current enclosing function is a constant constructor
   /// declaration.
   bool get isInConstConstructor {
-    var function = _resolver.enclosingFunction2;
-    if (function is ConstructorElement2) {
+    var function = _resolver.enclosingFunction;
+    if (function is ConstructorElementImpl2) {
       return function.isConst;
     }
     return false;

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

@@ -180,7 +180,7 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
 
   /// The element representing the function containing the current node, or
   /// `null` if the current node is not contained in a function.
-  ExecutableElement? _enclosingFunction;
+  ExecutableElementImpl2? enclosingFunction;
 
   /// The element that can be referenced by the `augmented` expression.
   AugmentableElement? enclosingAugmentation;
@@ -430,18 +430,6 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
   /// current node is inside a function body.
   BodyInferenceContext? get bodyContext => _bodyContext;
 
-  /// Return the element representing the function containing the current node,
-  /// or `null` if the current node is not contained in a function.
-  ///
-  /// @return the element representing the function containing the current node
-  ExecutableElement? get enclosingFunction => _enclosingFunction;
-
-  /// Return the element representing the function containing the current node,
-  /// or `null` if the current node is not contained in a function.
-  ///
-  /// @return the element representing the function containing the current node
-  ExecutableElement2? get enclosingFunction2 => _enclosingFunction.asElement2;
-
   @override
   FlowAnalysis<AstNodeImpl, StatementImpl, ExpressionImpl,
       PromotableElementImpl2, SharedTypeView> get flow => flowAnalysis.flow!;
@@ -1314,12 +1302,12 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
   /// Set information about enclosing declarations.
   void prepareEnclosingDeclarations({
     InterfaceElementImpl2? enclosingClassElement,
-    ExecutableElement? enclosingExecutableElement,
+    ExecutableElementImpl2? enclosingExecutableElement,
     AugmentableElement? enclosingAugmentation,
   }) {
     enclosingClass = enclosingClassElement;
     _setupThisType();
-    _enclosingFunction = enclosingExecutableElement;
+    enclosingFunction = enclosingExecutableElement;
     this.enclosingAugmentation = enclosingAugmentation;
   }
 
@@ -2334,14 +2322,15 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
 
   @override
   void visitConstructorDeclaration(covariant ConstructorDeclarationImpl node) {
-    var element = node.declaredElement!;
+    var fragment = node.declaredFragment!;
+    var element = fragment.element;
     var returnType = element.type.returnType;
-    var outerFunction = _enclosingFunction;
+    var outerFunction = enclosingFunction;
     var outerAugmentation = enclosingAugmentation;
 
     try {
-      _enclosingFunction = element;
-      enclosingAugmentation = element;
+      enclosingFunction = element;
+      enclosingAugmentation = fragment;
       assert(_thisType == null);
       _setupThisType();
       checkUnreachableNode(node);
@@ -2369,7 +2358,7 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
       flowAnalysis.bodyOrInitializer_exit();
       nullSafetyDeadCodeVerifier.flowEnd(node);
     } finally {
-      _enclosingFunction = outerFunction;
+      enclosingFunction = outerFunction;
       enclosingAugmentation = outerAugmentation;
       _thisType = null;
     }
@@ -2392,7 +2381,7 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
     expression = popRewrite()!;
     var whyNotPromoted = flowAnalysis.flow?.whyNotPromoted(expression);
     if (fieldElement != null) {
-      var enclosingConstructor = enclosingFunction as ConstructorElement;
+      var enclosingConstructor = enclosingFunction as ConstructorElementImpl2;
       checkForFieldInitializerNotAssignable(node, fieldElement.asElement2,
           isConstConstructor: enclosingConstructor.isConst,
           whyNotPromoted: whyNotPromoted);
@@ -2792,15 +2781,16 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
   @override
   void visitFunctionDeclaration(covariant FunctionDeclarationImpl node) {
     bool isLocal = node.parent is FunctionDeclarationStatement;
-    var element = node.declaredElement!;
+    var fragment = node.declaredFragment!;
+    var element = fragment.element;
     var functionType = node.declaredElement!.type;
-    var outerFunction = _enclosingFunction;
+    var outerFunction = enclosingFunction;
     var outerAugmentation = enclosingAugmentation;
 
     try {
-      _enclosingFunction = element;
+      enclosingFunction = element;
       if (!isLocal) {
-        if (element case AugmentableElement augmentation) {
+        if (fragment case AugmentableElement augmentation) {
           enclosingAugmentation = augmentation;
         }
       }
@@ -2843,7 +2833,7 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
       }
       nullSafetyDeadCodeVerifier.flowEnd(node);
     } finally {
-      _enclosingFunction = outerFunction;
+      enclosingFunction = outerFunction;
       enclosingAugmentation = outerAugmentation;
     }
   }
@@ -2860,13 +2850,13 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
   void visitFunctionExpression(covariant FunctionExpressionImpl node,
       {TypeImpl contextType = UnknownInferredType.instance}) {
     inferenceLogWriter?.enterExpression(node, contextType);
-    var outerFunction = _enclosingFunction;
-    _enclosingFunction = node.declaredElement;
+    var outerFunction = enclosingFunction;
+    enclosingFunction = node.declaredFragment!.element;
 
     _functionExpressionResolver.resolve(node, contextType: contextType);
     insertGenericFunctionInstantiation(node, contextType: contextType);
 
-    _enclosingFunction = outerFunction;
+    enclosingFunction = outerFunction;
     inferenceLogWriter?.exitExpression(node);
   }
 
@@ -3197,14 +3187,15 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
 
   @override
   void visitMethodDeclaration(covariant MethodDeclarationImpl node) {
-    var element = node.declaredElement!;
+    var fragment = node.declaredFragment!;
+    var element = fragment.element;
     var returnType = element.returnType;
-    var outerFunction = _enclosingFunction;
+    var outerFunction = enclosingFunction;
     var outerAugmentation = enclosingAugmentation;
 
     try {
-      _enclosingFunction = element;
-      if (element case AugmentableElement augmentation) {
+      enclosingFunction = element;
+      if (fragment case AugmentableElement augmentation) {
         enclosingAugmentation = augmentation;
       }
       assert(_thisType == null);
@@ -3233,7 +3224,7 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
       flowAnalysis.bodyOrInitializer_exit();
       nullSafetyDeadCodeVerifier.flowEnd(node);
     } finally {
-      _enclosingFunction = outerFunction;
+      enclosingFunction = outerFunction;
       enclosingAugmentation = outerAugmentation;
       _thisType = null;
     }

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

@@ -2,12 +2,9 @@
 // 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:_fe_analyzer_shared/src/types/shared_type.dart';
 import 'package:analyzer/dart/analysis/analysis_options.dart';
 import 'package:analyzer/dart/analysis/features.dart';
-import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/scope.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/error/listener.dart';
@@ -30,7 +27,7 @@ class AstResolver {
       AnalysisErrorListener.NULL_LISTENER;
   final AnalysisOptions analysisOptions;
   final InterfaceElementImpl2? enclosingClassElement;
-  final ExecutableElement? enclosingExecutableElement;
+  final ExecutableElementImpl2? enclosingExecutableElement;
   final AugmentableElement? enclosingAugmentation;
   late final _resolutionVisitor = ResolutionVisitor(
     unitElement: _unitElement,

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

@@ -57,9 +57,13 @@ class ConstructorInitializerResolver {
 
     var analysisOptions = _libraryBuilder.kind.file.analysisOptions;
     var astResolver = AstResolver(
-        _linker, unitElement, initializerScope, analysisOptions,
-        enclosingClassElement: classElement.asElement2,
-        enclosingExecutableElement: element);
+      _linker,
+      unitElement,
+      initializerScope,
+      analysisOptions,
+      enclosingClassElement: classElement.asElement2,
+      enclosingExecutableElement: element.asElement2,
+    );
 
     var body = node.body;
     body.localVariableInfo = LocalVariableInfo();

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

@@ -35,7 +35,7 @@ class DefaultValueResolver {
     }
   }
 
-  void _constructor(_ClassContext context, ConstructorElement element) {
+  void _constructor(_ClassContext context, ConstructorElementImpl element) {
     if (element.isSynthetic) return;
     _executable(context, element);
   }
@@ -49,15 +49,15 @@ class DefaultValueResolver {
     }
   }
 
-  void _executable(_Context context, ExecutableElement element) {
+  void _executable(_Context context, ExecutableElementImpl element) {
     _ExecutableContext(
       enclosingContext: context,
       executableElement: element,
       scope: _scopeFromElement(element),
     ).forEach(element.parameters, _parameter);
   }
 
-  void _extension(_UnitContext context, ExtensionElement element) {
+  void _extension(_UnitContext context, ExtensionElementImpl element) {
     context.forEach(element.methods, _executable);
   }
 
@@ -83,7 +83,7 @@ class DefaultValueResolver {
       context.scope,
       analysisOptions,
       enclosingClassElement: context.classElement?.asElement2,
-      enclosingExecutableElement: context.executableElement,
+      enclosingExecutableElement: context.executableElement.asElement2,
     );
     astResolver.resolveExpression(() => node.defaultValue!,
         contextType: contextType);
@@ -117,7 +117,7 @@ abstract class _Context {
 
 class _ExecutableContext extends _Context {
   final _Context enclosingContext;
-  final ExecutableElement executableElement;
+  final ExecutableElementImpl executableElement;
   final Scope scope;
 
   _ExecutableContext({