DeCo. Build PrimaryConstructorBody.

Bug: #61701
Change-Id: I8ad2dc544c6a91092e266ae52697c78ee57bc306
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/460884
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Johnni Winther <[email protected]>

Author: scheglov

pkg/analysis_server/lib/src/services/correction/dart/bind_to_field.dart

@@ -105,6 +105,8 @@ class BindToField extends ResolvedCorrectionProducer {
             ConstructorDeclaration() => false,
             FieldDeclaration() => false,
             MethodDeclaration() => member.name.lexeme == parameter.name?.lexeme,
+            // ignore: experimental_member_use
+            PrimaryConstructorBody() => false,
           },
         )) {
       return;

pkg/analysis_server/lib/src/services/correction/dart/create_method.dart

@@ -160,6 +160,8 @@ class CreateMethod extends ResolvedCorrectionProducer {
             fields: VariableDeclarationList(:var isLate),
           ) =>
             isStatic || !isLate,
+          // ignore: experimental_member_use
+          PrimaryConstructorBody() => false,
         };
       }
     } else {

pkg/analyzer/api.txt

@@ -247,6 +247,7 @@ package:analyzer/analysis_rule/rule_visitor_registry.dart:
     addPostfixExpression (method: void Function(AbstractAnalysisRule, AstVisitor<dynamic>))
     addPrefixExpression (method: void Function(AbstractAnalysisRule, AstVisitor<dynamic>))
     addPrefixedIdentifier (method: void Function(AbstractAnalysisRule, AstVisitor<dynamic>))
+    addPrimaryConstructorBody (method: void Function(AbstractAnalysisRule, AstVisitor<dynamic>), experimental)
     addPrimaryConstructorDeclaration (method: void Function(AbstractAnalysisRule, AstVisitor<dynamic>), experimental)
     addPrimaryConstructorName (method: void Function(AbstractAnalysisRule, AstVisitor<dynamic>), experimental)
     addPropertyAccess (method: void Function(AbstractAnalysisRule, AstVisitor<dynamic>))
@@ -771,6 +772,7 @@ package:analyzer/dart/ast/ast.dart:
     visitPostfixExpression (method: R? Function(PostfixExpression))
     visitPrefixExpression (method: R? Function(PrefixExpression))
     visitPrefixedIdentifier (method: R? Function(PrefixedIdentifier))
+    visitPrimaryConstructorBody (method: R? Function(PrimaryConstructorBody), experimental)
     visitPrimaryConstructorDeclaration (method: R? Function(PrimaryConstructorDeclaration), experimental)
     visitPrimaryConstructorName (method: R? Function(PrimaryConstructorName), experimental)
     visitPropertyAccess (method: R? Function(PropertyAccess))
@@ -893,7 +895,7 @@ package:analyzer/dart/ast/ast.dart:
     sealedKeyword (getter: Token?)
     typeParameters (getter: TypeParameterList?)
     withClause (getter: WithClause?)
-  ClassMember (class extends Object implements Declaration, sealed (immediate subtypes: ClassMemberImpl, ConstructorDeclaration, FieldDeclaration, MethodDeclaration))
+  ClassMember (class extends Object implements Declaration, sealed (immediate subtypes: ClassMemberImpl, ConstructorDeclaration, FieldDeclaration, MethodDeclaration, PrimaryConstructorBody))
   ClassNamePart (class extends Object implements AstNode, sealed (immediate subtypes: ClassNamePartImpl, NameWithTypeParameters, PrimaryConstructorDeclaration), experimental):
     typeName (getter: Token)
     typeParameters (getter: TypeParameterList?)
@@ -1555,6 +1557,11 @@ package:analyzer/dart/ast/ast.dart:
     isDeferred (getter: bool)
     period (getter: Token)
     prefix (getter: SimpleIdentifier)
+  PrimaryConstructorBody (class extends Object implements ClassMember, experimental):
+    body (getter: FunctionBody)
+    colon (getter: Token?)
+    initializers (getter: NodeList<ConstructorInitializer>)
+    thisKeyword (getter: Token)
   PrimaryConstructorDeclaration (class extends Object implements ClassNamePart, experimental):
     constKeyword (getter: Token?)
     constructorName (getter: PrimaryConstructorName?)
@@ -2343,6 +2350,7 @@ package:analyzer/dart/ast/visitor.dart:
     visitPostfixExpression (method: R? Function(PostfixExpression))
     visitPrefixExpression (method: R? Function(PrefixExpression))
     visitPrefixedIdentifier (method: R? Function(PrefixedIdentifier))
+    visitPrimaryConstructorBody (method: R? Function(PrimaryConstructorBody), experimental)
     visitPrimaryConstructorDeclaration (method: R? Function(PrimaryConstructorDeclaration), experimental)
     visitPrimaryConstructorName (method: R? Function(PrimaryConstructorName), experimental)
     visitPropertyAccess (method: R? Function(PropertyAccess))
@@ -2534,6 +2542,7 @@ package:analyzer/dart/ast/visitor.dart:
     visitPostfixExpression (method: R? Function(PostfixExpression))
     visitPrefixExpression (method: R? Function(PrefixExpression))
     visitPrefixedIdentifier (method: R? Function(PrefixedIdentifier))
+    visitPrimaryConstructorBody (method: R? Function(PrimaryConstructorBody), experimental)
     visitPrimaryConstructorDeclaration (method: R? Function(PrimaryConstructorDeclaration), experimental)
     visitPrimaryConstructorName (method: R? Function(PrimaryConstructorName), experimental)
     visitPropertyAccess (method: R? Function(PropertyAccess))
@@ -2715,6 +2724,7 @@ package:analyzer/dart/ast/visitor.dart:
     visitPostfixExpression (method: R? Function(PostfixExpression))
     visitPrefixExpression (method: R? Function(PrefixExpression))
     visitPrefixedIdentifier (method: R? Function(PrefixedIdentifier))
+    visitPrimaryConstructorBody (method: R? Function(PrimaryConstructorBody), experimental)
     visitPrimaryConstructorDeclaration (method: R? Function(PrimaryConstructorDeclaration), experimental)
     visitPrimaryConstructorName (method: R? Function(PrimaryConstructorName), experimental)
     visitPropertyAccess (method: R? Function(PropertyAccess))
@@ -2896,6 +2906,7 @@ package:analyzer/dart/ast/visitor.dart:
     visitPostfixExpression (method: R? Function(PostfixExpression))
     visitPrefixExpression (method: R? Function(PrefixExpression))
     visitPrefixedIdentifier (method: R? Function(PrefixedIdentifier))
+    visitPrimaryConstructorBody (method: R? Function(PrimaryConstructorBody), experimental)
     visitPrimaryConstructorDeclaration (method: R? Function(PrimaryConstructorDeclaration), experimental)
     visitPrimaryConstructorName (method: R? Function(PrimaryConstructorName), experimental)
     visitPropertyAccess (method: R? Function(PropertyAccess))
@@ -3078,6 +3089,7 @@ package:analyzer/dart/ast/visitor.dart:
     visitPostfixExpression (method: T? Function(PostfixExpression))
     visitPrefixExpression (method: T? Function(PrefixExpression))
     visitPrefixedIdentifier (method: T? Function(PrefixedIdentifier))
+    visitPrimaryConstructorBody (method: T? Function(PrimaryConstructorBody), experimental)
     visitPrimaryConstructorDeclaration (method: T? Function(PrimaryConstructorDeclaration), experimental)
     visitPrimaryConstructorName (method: T? Function(PrimaryConstructorName), experimental)
     visitPropertyAccess (method: T? Function(PropertyAccess))
@@ -3260,6 +3272,7 @@ package:analyzer/dart/ast/visitor.dart:
     visitPostfixExpression (method: R? Function(PostfixExpression))
     visitPrefixExpression (method: R? Function(PrefixExpression))
     visitPrefixedIdentifier (method: R? Function(PrefixedIdentifier))
+    visitPrimaryConstructorBody (method: R? Function(PrimaryConstructorBody), experimental)
     visitPrimaryConstructorDeclaration (method: R? Function(PrimaryConstructorDeclaration), experimental)
     visitPrimaryConstructorName (method: R? Function(PrimaryConstructorName), experimental)
     visitPropertyAccess (method: R? Function(PropertyAccess))

pkg/analyzer/lib/analysis_rule/rule_visitor_registry.g.dart

@@ -335,6 +335,9 @@ abstract class RuleVisitorRegistry {
 
   void addPrefixExpression(AbstractAnalysisRule rule, AstVisitor visitor);
 
+  @experimental
+  void addPrimaryConstructorBody(AbstractAnalysisRule rule, AstVisitor visitor);
+
   @experimental
   void addPrimaryConstructorDeclaration(
     AbstractAnalysisRule rule,

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

@@ -203,6 +203,7 @@ export 'package:analyzer/src/dart/ast/ast.dart'
         PostfixExpression,
         PrefixedIdentifier,
         PrefixExpression,
+        PrimaryConstructorBody,
         PrimaryConstructorDeclaration,
         PrimaryConstructorName,
         PropertyAccess,

pkg/analyzer/lib/dart/ast/visitor.g.dart

@@ -535,6 +535,11 @@ class GeneralizingAstVisitor<R> implements AstVisitor<R> {
   @override
   R? visitPrefixExpression(PrefixExpression node) => visitExpression(node);
 
+  @experimental
+  @override
+  R? visitPrimaryConstructorBody(PrimaryConstructorBody node) =>
+      visitClassMember(node);
+
   @experimental
   @override
   R? visitPrimaryConstructorDeclaration(PrimaryConstructorDeclaration node) =>
@@ -1529,6 +1534,13 @@ class RecursiveAstVisitor<R> implements AstVisitor<R> {
     return null;
   }
 
+  @experimental
+  @override
+  R? visitPrimaryConstructorBody(PrimaryConstructorBody node) {
+    node.visitChildren(this);
+    return null;
+  }
+
   @experimental
   @override
   R? visitPrimaryConstructorDeclaration(PrimaryConstructorDeclaration node) {
@@ -2245,6 +2257,10 @@ class SimpleAstVisitor<R> implements AstVisitor<R> {
   @override
   R? visitPrefixExpression(PrefixExpression node) => null;
 
+  @experimental
+  @override
+  R? visitPrimaryConstructorBody(PrimaryConstructorBody node) => null;
+
   @experimental
   @override
   R? visitPrimaryConstructorDeclaration(PrimaryConstructorDeclaration node) =>
@@ -2825,6 +2841,10 @@ class ThrowingAstVisitor<R> implements AstVisitor<R> {
   @override
   R? visitPrefixExpression(PrefixExpression node) => _throw(node);
 
+  @experimental
+  @override
+  R? visitPrimaryConstructorBody(PrimaryConstructorBody node) => _throw(node);
+
   @experimental
   @override
   R? visitPrimaryConstructorDeclaration(PrimaryConstructorDeclaration node) =>
@@ -4054,6 +4074,15 @@ class TimedAstVisitor<T> implements AstVisitor<T> {
     return result;
   }
 
+  @experimental
+  @override
+  T? visitPrimaryConstructorBody(PrimaryConstructorBody node) {
+    stopwatch.start();
+    T? result = _baseVisitor.visitPrimaryConstructorBody(node);
+    stopwatch.stop();
+    return result;
+  }
+
   @experimental
   @override
   T? visitPrimaryConstructorDeclaration(PrimaryConstructorDeclaration node) {
@@ -4901,6 +4930,11 @@ class UnifyingAstVisitor<R> implements AstVisitor<R> {
   @override
   R? visitPrefixExpression(PrefixExpression node) => visitNode(node);
 
+  @experimental
+  @override
+  R? visitPrimaryConstructorBody(PrimaryConstructorBody node) =>
+      visitNode(node);
+
   @experimental
   @override
   R? visitPrimaryConstructorDeclaration(PrimaryConstructorDeclaration node) =>

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

@@ -24,6 +24,7 @@ class _UnitApiSignatureComputer {
   static const int _kindConstructorDeclaration = 1;
   static const int _kindFieldDeclaration = 2;
   static const int _kindMethodDeclaration = 3;
+  static const int _kindPrimaryConstructorBody = 4;
   static const int _nullNode = 0;
   static const int _notNullNode = 1;
   static const int _nullToken = 0;
@@ -89,6 +90,8 @@ class _UnitApiSignatureComputer {
         _addFieldDeclaration(member, hasConstConstructor);
       } else if (member is MethodDeclaration) {
         _addMethodDeclaration(member);
+      } else if (member is PrimaryConstructorBody) {
+        _addPrimaryConstructorBody(member);
       } else {
         throw UnimplementedError('(${member.runtimeType}) $member');
       }
@@ -188,6 +191,11 @@ class _UnitApiSignatureComputer {
     }
   }
 
+  void _addPrimaryConstructorBody(PrimaryConstructorBody node) {
+    signature.addInt(_kindPrimaryConstructorBody);
+    _addTokens(node.beginToken, node.body.beginToken);
+  }
+
   void _addToken(Token? token) {
     if (token != null) {
       signature.addInt(_notNullToken);

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

@@ -20035,6 +20035,126 @@ final class PrefixExpressionImpl extends ExpressionImpl
   }
 }
 
+/// The body of a primary constructor.
+@AnalyzerPublicApi(message: 'exported by lib/dart/ast/ast.dart')
+@experimental
+// TODO(scheglov): This should not be a `Declaration`.
+abstract final class PrimaryConstructorBody implements ClassMember {
+  /// The body of the constructor.
+  FunctionBody get body;
+
+  /// The token for the separator before [initializers], or `null` if there
+  /// are no initializers.
+  Token? get colon;
+
+  /// The initializers associated with the constructor.
+  NodeList<ConstructorInitializer> get initializers;
+
+  /// The token for the `this` keyword.
+  Token get thisKeyword;
+}
+
+@GenerateNodeImpl(
+  childEntitiesOrder: [
+    GenerateNodeProperty('thisKeyword'),
+    GenerateNodeProperty('colon'),
+    GenerateNodeProperty('initializers'),
+    GenerateNodeProperty('body'),
+  ],
+)
+final class PrimaryConstructorBodyImpl extends ClassMemberImpl
+    implements PrimaryConstructorBody {
+  @generated
+  @override
+  final Token thisKeyword;
+
+  @generated
+  @override
+  final Token? colon;
+
+  @generated
+  @override
+  final NodeListImpl<ConstructorInitializerImpl> initializers =
+      NodeListImpl._();
+
+  @generated
+  FunctionBodyImpl _body;
+
+  @generated
+  PrimaryConstructorBodyImpl({
+    required super.comment,
+    required super.metadata,
+    required this.thisKeyword,
+    required this.colon,
+    required List<ConstructorInitializerImpl> initializers,
+    required FunctionBodyImpl body,
+  }) : _body = body {
+    this.initializers._initialize(this, initializers);
+    _becomeParentOf(body);
+  }
+
+  @generated
+  @override
+  FunctionBodyImpl get body => _body;
+
+  @generated
+  set body(FunctionBodyImpl body) {
+    _body = _becomeParentOf(body);
+  }
+
+  @generated
+  @override
+  Token get endToken {
+    return body.endToken;
+  }
+
+  @generated
+  @override
+  Token get firstTokenAfterCommentAndMetadata {
+    return thisKeyword;
+  }
+
+  @generated
+  @override
+  ChildEntities get _childEntities => super._childEntities
+    ..addToken('thisKeyword', thisKeyword)
+    ..addToken('colon', colon)
+    ..addNodeList('initializers', initializers)
+    ..addNode('body', body);
+
+  @generated
+  @override
+  E? accept<E>(AstVisitor<E> visitor) =>
+      visitor.visitPrimaryConstructorBody(this);
+
+  @override
+  dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
+
+  @generated
+  @override
+  void visitChildren(AstVisitor visitor) {
+    super.visitChildren(visitor);
+    initializers.accept(visitor);
+    body.accept(visitor);
+  }
+
+  @generated
+  @override
+  AstNodeImpl? _childContainingRange(int rangeOffset, int rangeEnd) {
+    if (super._childContainingRange(rangeOffset, rangeEnd) case var result?) {
+      return result;
+    }
+    if (initializers._elementContainingRange(rangeOffset, rangeEnd)
+        case var result?) {
+      return result;
+    }
+    if (body._containsOffset(rangeOffset, rangeEnd)) {
+      return body;
+    }
+    return null;
+  }
+}
+
 /// The declaration of a primary constructor.
 @AnalyzerPublicApi(message: 'exported by lib/dart/ast/ast.dart')
 @experimental

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

@@ -287,6 +287,9 @@ abstract class AstVisitor<R> {
 
   R? visitPrefixExpression(PrefixExpression node);
 
+  @experimental
+  R? visitPrimaryConstructorBody(PrimaryConstructorBody node);
+
   @experimental
   R? visitPrimaryConstructorDeclaration(PrimaryConstructorDeclaration node);
 

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

@@ -1151,6 +1151,17 @@ class ToSourceVisitor implements AstVisitor<void> {
     _writeOperand(node, node.operand);
   }
 
+  @override
+  void visitPrimaryConstructorBody(PrimaryConstructorBody node) {
+    _visitNodeList(node.metadata, separator: ' ', suffix: ' ');
+    _visitToken(node.thisKeyword);
+    if (node.initializers.isNotEmpty) {
+      _visitToken(node.colon, prefix: ' ', suffix: ' ');
+      _visitNodeList(node.initializers, separator: ', ');
+    }
+    _visitFunctionBody(node.body);
+  }
+
   @override
   void visitPrimaryConstructorDeclaration(PrimaryConstructorDeclaration node) {
     _visitToken(node.constKeyword, suffix: ' ');