DeCo. Resolve ExtensionTypeDeclaration when useDeclaringConstructorsAst is true.

Bug: #61701
Change-Id: Iaa13c26787eeba0e1b87a2283a526345d7bac1ba
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/461184
Reviewed-by: Paul Berry <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

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

@@ -988,11 +988,18 @@ class _IndexContributor extends GeneralizingAstVisitor {
   }
 
   @override
-  void visitExtensionTypeDeclaration(ExtensionTypeDeclaration node) {
+  void visitExtensionTypeDeclaration(
+    covariant ExtensionTypeDeclarationImpl node,
+  ) {
     _addSubtype(
-      node.name.lexeme,
+      (useDeclaringConstructorsAst
+              ? node.primaryConstructor.typeName
+              : node.name)
+          .lexeme,
       implementsClause: node.implementsClause,
-      memberNodes: node.members,
+      memberNodes: useDeclaringConstructorsAst
+          ? node.body.members
+          : node.members,
     );
 
     var declaredElement = node.declaredFragment!.element;

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

@@ -624,18 +624,34 @@ class ResolutionVisitor extends RecursiveAstVisitor<void> {
     _setOrCreateMetadataElements(fragment, node.metadata);
 
     if (identical(element.firstFragment, fragment)) {
-      _setOrCreateMetadataElements(
-        element.representation.firstFragment,
-        node.representation.fieldMetadata,
-      );
+      if (useDeclaringConstructorsAst) {
+        var formalParameters = node.primaryConstructor.formalParameters;
+        _setOrCreateMetadataElements(
+          element.representation.firstFragment,
+          formalParameters.parameters.first.metadata,
+        );
+      } else {
+        _setOrCreateMetadataElements(
+          element.representation.firstFragment,
+          node.representation.fieldMetadata,
+        );
+      }
     }
 
     _withElementWalker(ElementWalker.forExtensionType(fragment), () {
       _withNameScope(() {
-        _buildTypeParameterElements(node.typeParameters);
-        node.typeParameters?.accept(this);
+        var typeParameters = useDeclaringConstructorsAst
+            ? node.primaryConstructor.typeParameters
+            : node.typeParameters;
+        _buildTypeParameterElements(typeParameters);
+        typeParameters?.accept(this);
+
+        if (useDeclaringConstructorsAst) {
+          node.primaryConstructor.accept(this);
+        } else {
+          node.representation.accept(this);
+        }
 
-        node.representation.accept(this);
         _resolveImplementsClause(
           declaration: node,
           clause: node.implementsClause,
@@ -644,7 +660,11 @@ class ResolutionVisitor extends RecursiveAstVisitor<void> {
         _defineElements(element.getters);
         _defineElements(element.setters);
         _defineElements(element.methods);
-        node.members.accept(this);
+        if (useDeclaringConstructorsAst) {
+          node.body.accept(this);
+        } else {
+          node.members.accept(this);
+        }
       });
     });
 

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

@@ -252,6 +252,16 @@ class DuplicateDefinitionVerifier {
           fragment: declaredFragment,
           setterScope: definedSetters,
         );
+      } else if (member is ExtensionTypeDeclarationImpl) {
+        var declaredFragment = member.declaredFragment!;
+        _checkDuplicateIdentifier(
+          definedGetters,
+          useDeclaringConstructorsAst
+              ? member.primaryConstructor.typeName
+              : member.name,
+          fragment: declaredFragment,
+          setterScope: definedSetters,
+        );
       } else if (member is NamedCompilationUnitMemberImpl) {
         var declaredFragment = member.declaredFragment!;
         _checkDuplicateIdentifier(
@@ -838,7 +848,10 @@ class MemberDuplicateDefinitionVerifier {
       );
     }
 
-    _checkClassMembers(firstFragment, node.members);
+    _checkClassMembers(
+      firstFragment,
+      useDeclaringConstructorsAst ? node.body.members : node.members,
+    );
   }
 
   void _checkMixin(MixinDeclarationImpl node) {
@@ -885,7 +898,12 @@ class MemberDuplicateDefinitionVerifier {
           _checkExtensionStatic(declaration);
         case ExtensionTypeDeclarationImpl():
           var fragment = declaration.declaredFragment!;
-          _checkClassStatic(fragment, declaration.members);
+          _checkClassStatic(
+            fragment,
+            useDeclaringConstructorsAst
+                ? declaration.body.members
+                : declaration.members,
+          );
         case MixinDeclarationImpl():
           var fragment = declaration.declaredFragment!;
           _checkClassStatic(fragment, declaration.members);

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

@@ -859,12 +859,16 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
       _enclosingClass = firstFragment.asElement2;
 
       _checkForBuiltInIdentifierAsName(
-        node.name,
+        useDeclaringConstructorsAst
+            ? node.primaryConstructor.typeName
+            : node.name,
         CompileTimeErrorCode.builtInIdentifierAsExtensionTypeName,
       );
       _checkForConflictingExtensionTypeTypeVariableErrorCodes(declaredFragment);
 
-      var members = node.members;
+      var members = useDeclaringConstructorsAst
+          ? node.body.members
+          : node.members;
       _checkForRepeatedType(
         libraryContext.setOfImplements(firstFragment.asElement2),
         node.implementsClause?.interfaces,
@@ -3414,7 +3418,8 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
   void _checkForExtensionTypeWithAbstractMember(
     ExtensionTypeDeclarationImpl node,
   ) {
-    for (var member in node.members) {
+    for (var member
+        in useDeclaringConstructorsAst ? node.body.members : node.members) {
       if (member is MethodDeclarationImpl && !member.isStatic) {
         if (member.isAbstract) {
           diagnosticReporter.atNode(
@@ -4712,7 +4717,11 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
     ExtensionTypeDeclaration node,
     ExtensionTypeFragmentImpl fragment,
   ) {
-    var typeParameters = node.typeParameters?.typeParameters;
+    var typeParameters =
+        (useDeclaringConstructorsAst
+                ? node.primaryConstructor.typeParameters
+                : node.typeParameters)
+            ?.typeParameters;
     if (typeParameters == null) {
       return;
     }

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

@@ -5095,13 +5095,21 @@ class ScopeResolverVisitor extends UnifyingAstVisitor<void> {
 
       nameScope = TypeParameterScope(nameScope, element.typeParameters);
       node.nameScope = nameScope;
-      node.typeParameters?.accept(this);
-      node.representation.accept(this);
+      if (useDeclaringConstructorsAst) {
+        node.primaryConstructor.accept(this);
+      } else {
+        node.typeParameters?.accept(this);
+        node.representation.accept(this);
+      }
       node.implementsClause?.accept(this);
 
       nameScope = InstanceScope(nameScope, element);
       _visitDocumentationComment(node.documentationComment);
-      node.members.accept(this);
+      if (useDeclaringConstructorsAst) {
+        node.body.accept(this);
+      } else {
+        node.members.accept(this);
+      }
     } finally {
       nameScope = outerScope;
     }

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

@@ -123,6 +123,7 @@ extension AstNodeNullableExtension on AstNode? {
   List<ClassMember> get classMembers {
     var self = this;
     return switch (self) {
+      BlockClassBody() => self.members,
       ClassDeclaration() => self.members,
       EnumDeclaration() => self.members,
       ExtensionDeclaration() => self.members,