Elements. Migrate ResolverVisitor.enclosingClass

Change-Id: Ie5bea90ece546f220e4e48ff0b8037b93d09f8fe
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/409560
Reviewed-by: Phil Quitslund <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

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

@@ -749,16 +749,16 @@ class MethodInvocationResolver with ScopeHelpers {
       List<WhyNotPromotedGetter> whyNotPromotedArguments,
       {required TypeImpl contextType}) {
     var enclosingClass = _resolver.enclosingClass;
-    if (SuperContext.of(receiver) != SuperContext.valid) {
+    if (enclosingClass == null ||
+        SuperContext.of(receiver) != SuperContext.valid) {
       _setInvalidTypeResolution(node,
           whyNotPromotedArguments: whyNotPromotedArguments,
           contextType: contextType);
       return null;
     }
 
-    var augmented = enclosingClass!.augmented;
     var target = _inheritance.getMember2(
-      augmented.firstFragment,
+      enclosingClass.firstFragment,
       _currentName!,
       forSuper: true,
     );
@@ -778,7 +778,8 @@ class MethodInvocationResolver with ScopeHelpers {
     // Otherwise, this is an error.
     // But we would like to give the user at least some resolution.
     // So, we try to find the interface target.
-    target = _inheritance.getInherited2(augmented.firstFragment, _currentName!);
+    target =
+        _inheritance.getInherited2(enclosingClass.firstFragment, _currentName!);
     if (target != null) {
       nameNode.staticElement = target;
       _setResolution(node, target.type, whyNotPromotedArguments,
@@ -799,7 +800,7 @@ class MethodInvocationResolver with ScopeHelpers {
     _resolver.errorReporter.atNode(
       nameNode,
       CompileTimeErrorCode.UNDEFINED_SUPER_METHOD,
-      arguments: [name, augmented.firstFragment.displayName],
+      arguments: [name, enclosingClass.firstFragment.displayName],
     );
     return null;
   }

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

@@ -187,7 +187,7 @@ class SimpleIdentifierResolver with ScopeHelpers {
 
     var element = hasRead ? result.readElement2 : result.writeElement2;
 
-    var enclosingClass = _resolver.enclosingClass2;
+    var enclosingClass = _resolver.enclosingClass;
     if (_isFactoryConstructorReturnType(node) &&
         !identical(element, enclosingClass)) {
       errorReporter.atNode(

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

@@ -299,7 +299,7 @@ class ElementResolver {
 
   void visitRedirectingConstructorInvocation(
       covariant RedirectingConstructorInvocationImpl node) {
-    var enclosingClass = _resolver.enclosingClass2;
+    var enclosingClass = _resolver.enclosingClass;
     if (enclosingClass is! InterfaceElementImpl2) {
       // TODO(brianwilkerson): Report this error.
       return;
@@ -337,7 +337,7 @@ class ElementResolver {
 
   void visitSuperConstructorInvocation(
       covariant SuperConstructorInvocationImpl node) {
-    var enclosingClass = _resolver.enclosingClass2;
+    var enclosingClass = _resolver.enclosingClass;
     if (enclosingClass is! InterfaceElementImpl2) {
       // TODO(brianwilkerson): Report this error.
       return;

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

@@ -172,7 +172,7 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
 
   /// The class containing the AST nodes being visited,
   /// or `null` if we are not in the scope of a class.
-  InterfaceElementImpl? enclosingClass;
+  InterfaceElementImpl2? enclosingClass;
 
   /// The element representing the extension containing the AST nodes being
   /// visited, or `null` if we are not in the scope of an extension.
@@ -430,12 +430,6 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
   /// current node is inside a function body.
   BodyInferenceContext? get bodyContext => _bodyContext;
 
-  /// The class containing the AST nodes being visited,
-  /// or `null` if we are not in the scope of a class.
-  InterfaceElementImpl2? get enclosingClass2 {
-    return enclosingClass?.asElement2;
-  }
-
   /// Return the element representing the function containing the current node,
   /// or `null` if the current node is not contained in a function.
   ///
@@ -1319,13 +1313,11 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
 
   /// Set information about enclosing declarations.
   void prepareEnclosingDeclarations({
-    InterfaceElement? enclosingClassElement,
+    InterfaceElementImpl2? enclosingClassElement,
     ExecutableElement? enclosingExecutableElement,
     AugmentableElement? enclosingAugmentation,
   }) {
-    // TODO(paulberry): eliminate this cast by changing the type of the
-    // parameter `enclosingClassElement`.
-    enclosingClass = enclosingClassElement as InterfaceElementImpl?;
+    enclosingClass = enclosingClassElement;
     _setupThisType();
     _enclosingFunction = enclosingExecutableElement;
     this.enclosingAugmentation = enclosingAugmentation;
@@ -1349,7 +1341,7 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
     }
 
     void forClassElement(InterfaceElementImpl parentElement) {
-      enclosingClass = parentElement;
+      enclosingClass = parentElement.asElement2;
     }
 
     if (parent is ClassDeclarationImpl) {
@@ -2229,7 +2221,7 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
     //
     var outerType = enclosingClass;
     try {
-      enclosingClass = node.declaredElement;
+      enclosingClass = declaredElement;
       checkUnreachableNode(node);
       node.visitChildren(this);
       elementResolver.visitClassDeclaration(node);
@@ -2387,14 +2379,12 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
   void visitConstructorFieldInitializer(
     covariant ConstructorFieldInitializerImpl node,
   ) {
-    var augmented = enclosingClass!.augmented;
-
     //
     // We visit the expression, but do not visit the field name because it needs
     // to be visited in the context of the constructor field initializer node.
     //
     var fieldName = node.fieldName;
-    var fieldElement = augmented.getField(fieldName.name);
+    var fieldElement = enclosingClass!.getField(fieldName.name);
     fieldName.staticElement = fieldElement;
     var fieldType = fieldElement?.type ?? UnknownInferredType.instance;
     var expression = node.expression;
@@ -2617,7 +2607,7 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
     //
     var outerType = enclosingClass;
     try {
-      enclosingClass = node.declaredElement;
+      enclosingClass = node.declaredFragment!.element;
       checkUnreachableNode(node);
       node.visitChildren(this);
       elementResolver.visitEnumDeclaration(node);
@@ -2735,7 +2725,7 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
   ) {
     var outerType = enclosingClass;
     try {
-      enclosingClass = node.declaredElement;
+      enclosingClass = node.declaredFragment!.element;
       checkUnreachableNode(node);
       node.visitChildren(this);
       elementResolver.visitExtensionTypeDeclaration(node);
@@ -3296,7 +3286,7 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
     //
     var outerType = enclosingClass;
     try {
-      enclosingClass = node.declaredElement!;
+      enclosingClass = node.declaredFragment!.element;
       checkUnreachableNode(node);
       node.visitChildren(this);
       elementResolver.visitMixinDeclaration(node);
@@ -4242,8 +4232,7 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
   void _setupThisType() {
     var enclosingClass = this.enclosingClass;
     if (enclosingClass != null) {
-      var augmented = enclosingClass.augmented;
-      _thisType = augmented.firstFragment.thisType;
+      _thisType = enclosingClass.thisType;
     } else {
       var enclosingExtension = this.enclosingExtension;
       if (enclosingExtension != null) {

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

@@ -29,7 +29,7 @@ class AstResolver {
   final AnalysisErrorListener _errorListener =
       AnalysisErrorListener.NULL_LISTENER;
   final AnalysisOptions analysisOptions;
-  final InterfaceElement? enclosingClassElement;
+  final InterfaceElementImpl2? enclosingClassElement;
   final ExecutableElement? enclosingExecutableElement;
   final AugmentableElement? enclosingAugmentation;
   late final _resolutionVisitor = ResolutionVisitor(

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

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

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

@@ -13,6 +13,7 @@ import 'package:analyzer/src/summary2/ast_resolver.dart';
 import 'package:analyzer/src/summary2/library_builder.dart';
 import 'package:analyzer/src/summary2/link.dart';
 import 'package:analyzer/src/summary2/linking_node_scope.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
 
 class DefaultValueResolver {
   final Linker _linker;
@@ -60,7 +61,7 @@ class DefaultValueResolver {
     context.forEach(element.methods, _executable);
   }
 
-  void _interface(_UnitContext context, InterfaceElement element) {
+  void _interface(_UnitContext context, InterfaceElementImpl element) {
     _ClassContext(context, element)
       ..forEach(element.constructors, _constructor)
       ..forEach(element.methods, _executable);
@@ -81,7 +82,7 @@ class DefaultValueResolver {
       context.unitElement,
       context.scope,
       analysisOptions,
-      enclosingClassElement: context.classElement,
+      enclosingClassElement: context.classElement?.asElement2,
       enclosingExecutableElement: context.executableElement,
     );
     astResolver.resolveExpression(() => node.defaultValue!,
@@ -98,7 +99,7 @@ class _ClassContext extends _Context {
   final _UnitContext unitContext;
 
   @override
-  final InterfaceElement classElement;
+  final InterfaceElementImpl classElement;
 
   _ClassContext(this.unitContext, this.classElement);
 
@@ -109,7 +110,7 @@ class _ClassContext extends _Context {
 }
 
 abstract class _Context {
-  InterfaceElement? get classElement => null;
+  InterfaceElementImpl? get classElement => null;
 
   CompilationUnitElementImpl get unitElement;
 }
@@ -126,7 +127,7 @@ class _ExecutableContext extends _Context {
   });
 
   @override
-  InterfaceElement? get classElement {
+  InterfaceElementImpl? get classElement {
     return enclosingContext.classElement;
   }
 

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

@@ -16,6 +16,7 @@ import 'package:analyzer/src/summary2/instance_member_inferrer.dart';
 import 'package:analyzer/src/summary2/library_builder.dart';
 import 'package:analyzer/src/summary2/link.dart';
 import 'package:analyzer/src/summary2/linking_node_scope.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
 import 'package:analyzer/src/utilities/extensions/object.dart';
 import 'package:collection/collection.dart';
 
@@ -252,10 +253,8 @@ class _PropertyInducingElementTypeInference
     _status = _InferenceStatus.beingInferred;
 
     var enclosingElement = _element.enclosingElement3;
-    var enclosingInterfaceElement = enclosingElement
-        .ifTypeOrNull<InterfaceElement>()
-        ?.augmented
-        .firstFragment;
+    var enclosingInterfaceElement =
+        enclosingElement.ifTypeOrNull<InterfaceElementImpl>()?.asElement2;
 
     var analysisOptions = _libraryBuilder.kind.file.analysisOptions;
     var astResolver = AstResolver(