DeCo. Build elements from new ASTs.

For now just to understand the same syntax represented with new AST nodes. We now run element tests for classes, enums, extensions, extension types, and mixins in both modes: old AST and new AST. Bug: #61701 Change-Id: I768c16ea4a8bee4579732f80c1beb4bb8a42de43 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/457161 Reviewed-by: Paul Berry <paulberry@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@google.com> Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>

Author: scheglov

pkg/analyzer/api.txt

@@ -1107,7 +1107,7 @@ package:analyzer/dart/ast/ast.dart:
  superclass (getter: NamedType)
  ExtensionDeclaration (class extends Object implements CompilationUnitMember):
  augmentKeyword (getter: Token?)
- body (getter: BlockClassBody?, experimental)
+ body (getter: BlockClassBody, experimental)
  declaredFragment (getter: ExtensionFragment?)
  extensionKeyword (getter: Token)
  leftBracket (getter: Token)
@@ -1437,7 +1437,7 @@ package:analyzer/dart/ast/ast.dart:
  MixinDeclaration (class extends Object implements NamedCompilationUnitMember):
  augmentKeyword (getter: Token?)
  baseKeyword (getter: Token?)
- body (getter: ClassBody, experimental)
+ body (getter: BlockClassBody, experimental)
  declaredFragment (getter: MixinFragment?)
  implementsClause (getter: ImplementsClause?)
  leftBracket (getter: Token)

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

@@ -303,4 +303,4 @@ export 'package:analyzer/src/dart/ast/ast.dart'
 /// 8. [ExtensionTypeDeclaration.visitChildren] visits `namePart` and `body`,
 /// and does not visit `typeParameters`, `representation`, or `members`.
 @experimental
-bool useDeclaringConstructorsAst = false;
+bool useDeclaringConstructorsAst = default_useDeclaringConstructorsAst;

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

@@ -4,6 +4,7 @@
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
+import 'package:analyzer/src/dart/ast/ast.dart';
 
 /// Compute the [DefinedNames] for the given [unit].
 DefinedNames computeDefinedNames(CompilationUnit unit) {
@@ -28,21 +29,46 @@ DefinedNames computeDefinedNames(CompilationUnit unit) {
 
  void appendTopLevelName(CompilationUnitMember member) {
  if (member is NamedCompilationUnitMember) {
- appendName(names.topLevelNames, member.name);
- if (member is ClassDeclaration) {
- member.members.forEach(appendClassMemberName);
- }
- if (member is EnumDeclaration) {
- for (var constant in member.constants) {
- appendName(names.classMemberNames, constant.name);
- }
- member.members.forEach(appendClassMemberName);
- }
- if (member is ExtensionTypeDeclaration) {
- member.members.forEach(appendClassMemberName);
- }
- if (member is MixinDeclaration) {
- member.members.forEach(appendClassMemberName);
+ switch (member) {
+ case ClassDeclarationImpl():
+ if (useDeclaringConstructorsAst) {
+ appendName(names.topLevelNames, member.namePart.typeName);
+ member.body.members.forEach(appendClassMemberName);
+ } else {
+ appendName(names.topLevelNames, member.name);
+ member.members.forEach(appendClassMemberName);
+ }
+ case EnumDeclaration():
+ if (useDeclaringConstructorsAst) {
+ appendName(names.topLevelNames, member.namePart.typeName);
+ for (var constant in member.body.constants) {
+ appendName(names.classMemberNames, constant.name);
+ }
+ member.body.members.forEach(appendClassMemberName);
+ } else {
+ appendName(names.topLevelNames, member.name);
+ for (var constant in member.constants) {
+ appendName(names.classMemberNames, constant.name);
+ }
+ member.members.forEach(appendClassMemberName);
+ }
+ case ExtensionTypeDeclarationImpl():
+ if (useDeclaringConstructorsAst) {
+ appendName(names.topLevelNames, member.namePart.typeName);
+ member.body.members.forEach(appendClassMemberName);
+ } else {
+ appendName(names.topLevelNames, member.name);
+ member.members.forEach(appendClassMemberName);
+ }
+ case MixinDeclaration():
+ appendName(names.topLevelNames, member.name);
+ if (useDeclaringConstructorsAst) {
+ member.body.members.forEach(appendClassMemberName);
+ } else {
+ member.members.forEach(appendClassMemberName);
+ }
+ default:
+ appendName(names.topLevelNames, member.name);
  }
  } else if (member is TopLevelVariableDeclaration) {
  for (VariableDeclaration variable in member.variables.variables) {

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

@@ -7,6 +7,7 @@ import 'dart:typed_data';
 
 import 'package:analyzer/dart/analysis/declared_variables.dart';
 import 'package:analyzer/dart/analysis/results.dart';
+import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/diagnostic/diagnostic.dart';
 import 'package:analyzer/error/error.dart';
 import 'package:analyzer/error/listener.dart';
@@ -2487,7 +2488,9 @@ class AnalysisDriver {
  static Uint32List _calculateSaltForElements(
  DeclaredVariables declaredVariables,
  ) {
- var buffer = ApiSignature()..addInt(DATA_VERSION);
+ var buffer = ApiSignature()
+ ..addInt(DATA_VERSION)
+ ..addBool(useDeclaringConstructorsAst);
  _addDeclaredVariablesToSignature(buffer, declaredVariables);
  return buffer.toUint32List();
  }
@@ -2500,6 +2503,7 @@ class AnalysisDriver {
  var buffer = ApiSignature()
  ..addInt(DATA_VERSION)
  ..addBool(enableIndex)
+ ..addBool(useDeclaringConstructorsAst)
  ..addBool(enableDebugResolutionMarkers);
  _addDeclaredVariablesToSignature(buffer, declaredVariables);
 
@@ -2512,7 +2516,8 @@ class AnalysisDriver {
  static Uint32List _calculateSaltForUnlinked({required bool enableIndex}) {
  var buffer = ApiSignature()
  ..addInt(DATA_VERSION)
- ..addBool(enableIndex);
+ ..addBool(enableIndex)
+ ..addBool(useDeclaringConstructorsAst);
 
  return buffer.toUint32List();
  }

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

@@ -11,6 +11,7 @@ import 'package:_fe_analyzer_shared/src/scanner/string_canonicalizer.dart';
 import 'package:analyzer/dart/analysis/analysis_options.dart';
 import 'package:analyzer/dart/analysis/declared_variables.dart';
 import 'package:analyzer/dart/analysis/features.dart';
+import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/error/listener.dart';
@@ -1010,14 +1011,28 @@ class FileState {
  var topLevelDeclarations = <String>{};
  for (var declaration in unit.declarations) {
  if (declaration is ClassDeclaration) {
- topLevelDeclarations.add(declaration.name.lexeme);
+ if (useDeclaringConstructorsAst) {
+ topLevelDeclarations.add(declaration.namePart.typeName.lexeme);
+ } else {
+ topLevelDeclarations.add(declaration.name.lexeme);
+ }
  } else if (declaration is EnumDeclaration) {
- topLevelDeclarations.add(declaration.name.lexeme);
+ if (useDeclaringConstructorsAst) {
+ topLevelDeclarations.add(declaration.namePart.typeName.lexeme);
+ } else {
+ topLevelDeclarations.add(declaration.name.lexeme);
+ }
  } else if (declaration is ExtensionDeclaration) {
  var name = declaration.name;
  if (name != null) {
  topLevelDeclarations.add(name.lexeme);
  }
+ } else if (declaration is ExtensionTypeDeclaration) {
+ if (useDeclaringConstructorsAst) {
+ topLevelDeclarations.add(declaration.namePart.typeName.lexeme);
+ } else {
+ topLevelDeclarations.add(declaration.name.lexeme);
+ }
  } else if (declaration is FunctionDeclaration) {
  topLevelDeclarations.add(declaration.name.lexeme);
  } else if (declaration is MixinDeclaration) {

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

@@ -5,6 +5,7 @@
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
+import 'package:analyzer/src/dart/ast/ast.dart';
 
 /// Compute the set of external names referenced in the [unit].
 Set<String> computeReferencedNames(CompilationUnit unit) {
@@ -72,15 +73,26 @@ class _LocalNameScope {
 
  factory _LocalNameScope.forClass(
  _LocalNameScope enclosing,
- ClassDeclaration node,
+ ClassDeclarationImpl node,
  ) {
  _LocalNameScope scope = _LocalNameScope(enclosing);
- scope.addTypeParameters(node.typeParameters);
- for (ClassMember member in node.members) {
- if (member is FieldDeclaration) {
- scope.addVariableNames(member.fields);
- } else if (member is MethodDeclaration) {
- scope.add(member.name);
+ if (useDeclaringConstructorsAst) {
+ scope.addTypeParameters(node.namePart.typeParameters);
+ for (ClassMember member in node.body.members) {
+ if (member is FieldDeclaration) {
+ scope.addVariableNames(member.fields);
+ } else if (member is MethodDeclaration) {
+ scope.add(member.name);
+ }
+ }
+ } else {
+ scope.addTypeParameters(node.typeParameters);
+ for (ClassMember member in node.members) {
+ if (member is FieldDeclaration) {
+ scope.addVariableNames(member.fields);
+ } else if (member is MethodDeclaration) {
+ scope.add(member.name);
+ }
  }
  }
  return scope;
@@ -106,15 +118,26 @@ class _LocalNameScope {
 
  factory _LocalNameScope.forExtensionType(
  _LocalNameScope enclosing,
- ExtensionTypeDeclaration node,
+ ExtensionTypeDeclarationImpl node,
  ) {
  var scope = _LocalNameScope(enclosing);
- scope.addTypeParameters(node.typeParameters);
- for (var member in node.members) {
- if (member is FieldDeclaration) {
- scope.addVariableNames(member.fields);
- } else if (member is MethodDeclaration) {
- scope.add(member.name);
+ if (useDeclaringConstructorsAst) {
+ scope.addTypeParameters(node.namePart.typeParameters);
+ for (ClassMember member in node.body.members) {
+ if (member is FieldDeclaration) {
+ scope.addVariableNames(member.fields);
+ } else if (member is MethodDeclaration) {
+ scope.add(member.name);
+ }
+ }
+ } else {
+ scope.addTypeParameters(node.typeParameters);
+ for (var member in node.members) {
+ if (member is FieldDeclarationImpl) {
+ scope.addVariableNames(member.fields);
+ } else if (member is MethodDeclarationImpl) {
+ scope.add(member.name);
+ }
  }
  }
  return scope;
@@ -152,10 +175,29 @@ class _LocalNameScope {
  factory _LocalNameScope.forUnit(CompilationUnit node) {
  _LocalNameScope scope = _LocalNameScope(null);
  for (CompilationUnitMember declaration in node.declarations) {
- if (declaration is NamedCompilationUnitMember) {
- scope.add(declaration.name);
- } else if (declaration is TopLevelVariableDeclaration) {
- scope.addVariableNames(declaration.variables);
+ switch (declaration) {
+ case ClassDeclaration():
+ if (useDeclaringConstructorsAst) {
+ scope.add(declaration.namePart.typeName);
+ } else {
+ scope.add(declaration.name);
+ }
+ case EnumDeclaration():
+ if (useDeclaringConstructorsAst) {
+ scope.add(declaration.namePart.typeName);
+ } else {
+ scope.add(declaration.name);
+ }
+ case ExtensionTypeDeclaration():
+ if (useDeclaringConstructorsAst) {
+ scope.add(declaration.namePart.typeName);
+ } else {
+ scope.add(declaration.name);
+ }
+ case NamedCompilationUnitMember():
+ scope.add(declaration.name);
+ case TopLevelVariableDeclaration():
+ scope.addVariableNames(declaration.variables);
  }
  }
  return scope;
@@ -216,7 +258,7 @@ class _ReferencedNamesComputer extends GeneralizingAstVisitor<void> {
  }
 
  @override
- void visitClassDeclaration(ClassDeclaration node) {
+ void visitClassDeclaration(covariant ClassDeclarationImpl node) {
  _LocalNameScope outerScope = localScope;
  try {
  localScope = _LocalNameScope.forClass(localScope, node);
@@ -262,7 +304,9 @@ class _ReferencedNamesComputer extends GeneralizingAstVisitor<void> {
  }
 
  @override
- void visitExtensionTypeDeclaration(ExtensionTypeDeclaration node) {
+ void visitExtensionTypeDeclaration(
+ covariant ExtensionTypeDeclarationImpl node,
+ ) {
  var outerScope = localScope;
  try {
  localScope = _LocalNameScope.forExtensionType(localScope, node);

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

@@ -6,6 +6,7 @@ import 'dart:typed_data';
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
+import 'package:analyzer/src/dart/ast/ast.dart';
 import 'package:analyzer/src/dart/ast/invokes_super_self.dart';
 import 'package:analyzer/src/dart/ast/mixin_super_invoked_names.dart';
 import 'package:analyzer/src/summary/api_signature.dart';
@@ -38,7 +39,7 @@ class _UnitApiSignatureComputer {
 
  signature.addInt(unit.declarations.length);
  for (var declaration in unit.declarations) {
- if (declaration is ClassDeclaration) {
+ if (declaration is ClassDeclarationImpl) {
  _addClass(declaration);
  } else if (declaration is EnumDeclaration) {
  _addEnum(declaration);
@@ -61,14 +62,22 @@ class _UnitApiSignatureComputer {
  }
  }
 
- void _addClass(ClassDeclaration node) {
- _addTokens(node.beginToken, node.leftBracket);
+ void _addClass(ClassDeclarationImpl node) {
+ if (useDeclaringConstructorsAst) {
+ _addTokens(node.beginToken, node.body.beginToken);
+ bool hasConstConstructor = node.body.members.any(
+ (m) => m is ConstructorDeclarationImpl && m.constKeyword != null,
+ );
+ _addClassMembers(node.body.members, hasConstConstructor);
+ } else {
+ _addTokens(node.beginToken, node.leftBracket);
 
- bool hasConstConstructor = node.members.any(
- (m) => m is ConstructorDeclaration && m.constKeyword != null,
- );
+  bool hasConstConstructor = node.members.any(
+  (m) => m is ConstructorDeclarationImpl && m.constKeyword != null,
+  );
 
- _addClassMembers(node.members, hasConstConstructor);
+ _addClassMembers(node.members, hasConstConstructor);
+ }
  }
 
  void _addClassMembers(List<ClassMember> members, bool hasConstConstructor) {
@@ -94,7 +103,9 @@ class _UnitApiSignatureComputer {
  }
 
  void _addEnum(EnumDeclaration node) {
- var members = node.members;
+ var members = useDeclaringConstructorsAst
+ ? node.body.members
+ : node.members;
 
  // If not enhanced, include the whole node.
  var firstMember = members.firstOrNull;
@@ -108,8 +119,13 @@ class _UnitApiSignatureComputer {
  }
 
  void _addExtension(ExtensionDeclaration node) {
- _addTokens(node.beginToken, node.leftBracket);
- _addClassMembers(node.members, false);
+ if (useDeclaringConstructorsAst) {
+ _addTokens(node.beginToken, node.body.beginToken);
+ _addClassMembers(node.body.members, false);
+ } else {
+ _addTokens(node.beginToken, node.leftBracket);
+ _addClassMembers(node.members, false);
+ }
  }
 
  void _addFieldDeclaration(FieldDeclaration node, bool hasConstConstructor) {
@@ -147,8 +163,13 @@ class _UnitApiSignatureComputer {
  }
 
  void _addMixin(MixinDeclaration node) {
- _addTokens(node.beginToken, node.leftBracket);
- _addClassMembers(node.members, false);
+ if (useDeclaringConstructorsAst) {
+ _addTokens(node.beginToken, node.body.beginToken);
+ _addClassMembers(node.body.members, false);
+ } else {
+ _addTokens(node.beginToken, node.leftBracket);
+ _addClassMembers(node.members, false);
+ }
  signature.addStringList(node.superInvokedNames);
  }