[cfe] Move parent, name, charOffset and fileUri to subclasses

Change-Id: Ic9928a1a235182e7c660f7bc0b729fa0355b8f43
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/389120
Reviewed-by: Jens Johansen <[email protected]>
Commit-Queue: Johnni Winther <[email protected]>

Author: johnniwinther

pkg/front_end/lib/src/builder/builtin_type_declaration_builder.dart

@@ -6,15 +6,23 @@ part of 'declaration_builders.dart';
 
 abstract class BuiltinTypeDeclarationBuilder extends TypeDeclarationBuilderImpl
     implements TypeDeclarationBuilder {
+  @override
+  final LibraryBuilder parent;
+
+  @override
+  final int charOffset;
+
+  @override
+  final String name;
+
   final DartType type;
 
   @override
   final Uri fileUri;
 
   BuiltinTypeDeclarationBuilder(
-      String name, this.type, LibraryBuilder compilationUnit, int charOffset)
-      : fileUri = compilationUnit.fileUri,
-        super(name, compilationUnit, charOffset);
+      this.name, this.type, this.parent, this.charOffset)
+      : fileUri = parent.fileUri;
 
   @override
   DartType buildAliasedType(

pkg/front_end/lib/src/builder/class_builder.dart

@@ -179,10 +179,6 @@ abstract class ClassBuilderImpl extends DeclarationBuilderImpl
   InterfaceType? _nonNullableRawType;
   InterfaceType? _thisType;
 
-  ClassBuilderImpl(
-      String name, LibraryBuilder parent, Uri fileUri, int fileOffset)
-      : super(name, parent, fileUri, fileOffset);
-
   @override
   bool get isMixinApplication => mixedInTypeBuilder != null;
 
@@ -299,9 +295,8 @@ abstract class ClassBuilderImpl extends DeclarationBuilderImpl
   @override
   bool get isFutureOr {
     if (name == "FutureOr") {
-      LibraryBuilder parentLibrary = parent as LibraryBuilder;
-      if (parentLibrary.importUri.isScheme("dart") &&
-          parentLibrary.importUri.path == "async") {
+      if (parent.importUri.isScheme("dart") &&
+          parent.importUri.path == "async") {
         return true;
       }
     }

pkg/front_end/lib/src/builder/declaration_builder.dart

@@ -51,16 +51,11 @@ abstract class IDeclarationBuilder implements ITypeDeclarationBuilder {
 abstract class DeclarationBuilderImpl extends TypeDeclarationBuilderImpl
     implements IDeclarationBuilder {
   @override
-  final Uri fileUri;
-
-  DeclarationBuilderImpl(
-      String name, LibraryBuilder parent, this.fileUri, int fileOffset)
-      : super(name, parent, fileOffset);
+  LibraryBuilder get parent;
 
   @override
   LibraryBuilder get libraryBuilder {
-    LibraryBuilder library = parent as LibraryBuilder;
-    return library.partOfLibrary ?? library;
+    return parent.partOfLibrary ?? parent;
   }
 
   @override

pkg/front_end/lib/src/builder/extension_builder.dart

@@ -33,10 +33,6 @@ abstract class ExtensionBuilder implements DeclarationBuilder {
 abstract class ExtensionBuilderImpl extends DeclarationBuilderImpl
     with DeclarationBuilderMixin
     implements ExtensionBuilder {
-  ExtensionBuilderImpl(
-      String name, LibraryBuilder parent, Uri fileUri, int fileOffset)
-      : super(name, parent, fileUri, fileOffset);
-
   @override
   DartType buildAliasedTypeWithBuiltArguments(
       LibraryBuilder library,

pkg/front_end/lib/src/builder/extension_type_declaration_builder.dart

@@ -38,10 +38,6 @@ abstract class ExtensionTypeDeclarationBuilderImpl
     extends DeclarationBuilderImpl
     with DeclarationBuilderMixin
     implements ExtensionTypeDeclarationBuilder {
-  ExtensionTypeDeclarationBuilderImpl(
-      String name, LibraryBuilder parent, Uri fileUri, int fileOffset)
-      : super(name, parent, fileUri, fileOffset);
-
   @override
   DartType buildAliasedTypeWithBuiltArguments(
       LibraryBuilder library,

pkg/front_end/lib/src/builder/invalid_type_declaration_builder.dart

@@ -7,15 +7,24 @@ part of 'declaration_builders.dart';
 class InvalidTypeDeclarationBuilder extends TypeDeclarationBuilderImpl
     with ErroneousMemberBuilderMixin
     implements TypeDeclarationBuilder {
+  @override
+  final String name;
+
   final LocatedMessage message;
 
   final List<LocatedMessage>? context;
 
   final bool suppressMessage;
 
-  InvalidTypeDeclarationBuilder(String name, this.message,
-      {this.context, this.suppressMessage = true})
-      : super(name, null, message.charOffset);
+  InvalidTypeDeclarationBuilder(this.name, this.message,
+      {this.context, this.suppressMessage = true});
+
+  @override
+  Builder? get parent => null;
+
+  @override
+  // Coverage-ignore(suite): Not run.
+  int get charOffset => message.charOffset;
 
   @override
   // Coverage-ignore(suite): Not run.

pkg/front_end/lib/src/builder/omitted_type_declaration_builder.dart

@@ -11,11 +11,19 @@ part of 'declaration_builders.dart';
 /// inferred types in the original code.
 class OmittedTypeDeclarationBuilder extends TypeDeclarationBuilderImpl
     implements TypeDeclarationBuilder {
+  @override
+  final SourceLibraryBuilder parent;
+
+  @override
+  final String name;
+
   final OmittedTypeBuilder omittedTypeBuilder;
 
   OmittedTypeDeclarationBuilder(
-      String name, this.omittedTypeBuilder, SourceLibraryBuilder parent)
-      : super(name, parent, TreeNode.noOffset);
+      this.name, this.omittedTypeBuilder, this.parent);
+
+  @override
+  int get charOffset => TreeNode.noOffset;
 
   @override
   DartType buildAliasedType(
@@ -55,5 +63,5 @@ class OmittedTypeDeclarationBuilder extends TypeDeclarationBuilderImpl
   }
 
   @override
-  Uri? get fileUri => parent!.fileUri;
+  Uri? get fileUri => parent.fileUri;
 }

pkg/front_end/lib/src/builder/type_alias_builder.dart

@@ -129,25 +129,15 @@ abstract class TypeAliasBuilder implements TypeDeclarationBuilder {
 
 abstract class TypeAliasBuilderImpl extends TypeDeclarationBuilderImpl
     implements TypeAliasBuilder {
-  @override
-  final Uri fileUri;
-
   TypeBuilder? _unaliasedRhsType;
 
   List<TypeAliasBuilder> _typeAliasesUsedInUnaliasing = [];
 
-  TypeAliasBuilderImpl(
-      String name, LibraryBuilder parent, this.fileUri, int fileOffset)
-      : super(name, parent, fileOffset);
-
   @override
   String get debugName => "TypeAliasBuilder";
 
   @override
-  LibraryBuilder get parent => super.parent as LibraryBuilder;
-
-  @override
-  LibraryBuilder get libraryBuilder => super.parent as LibraryBuilder;
+  LibraryBuilder get libraryBuilder => parent;
 
   /// [arguments] have already been built.
   @override

pkg/front_end/lib/src/builder/type_declaration_builder.dart

@@ -60,17 +60,6 @@ abstract class ITypeDeclarationBuilder implements Builder {
 
 abstract class TypeDeclarationBuilderImpl extends BuilderImpl
     implements ITypeDeclarationBuilder {
-  @override
-  final Builder? parent;
-
-  @override
-  final int charOffset;
-
-  @override
-  final String name;
-
-  TypeDeclarationBuilderImpl(this.name, this.parent, this.charOffset);
-
   @override
   TypeDeclarationBuilder get origin => this as TypeDeclarationBuilder;
 

pkg/front_end/lib/src/builder/type_variable_builder.dart

@@ -24,6 +24,12 @@ enum TypeVariableKind {
 
 sealed class TypeVariableBuilder extends TypeDeclarationBuilderImpl
     implements TypeDeclarationBuilder {
+  @override
+  final int charOffset;
+
+  @override
+  final String name;
+
   TypeBuilder? bound;
 
   TypeBuilder? defaultType;
@@ -39,14 +45,17 @@ sealed class TypeVariableBuilder extends TypeDeclarationBuilderImpl
 
   final List<MetadataBuilder>? metadata;
 
-  TypeVariableBuilder(String name, int charOffset, this.fileUri,
+  TypeVariableBuilder(this.name, this.charOffset, this.fileUri,
       {this.bound,
       this.defaultType,
       required this.kind,
       Variance? variableVariance,
       this.metadata,
-      this.isWildcard = false})
-      : super(name, null, charOffset);
+      this.isWildcard = false});
+
+  @override
+  // Coverage-ignore(suite): Not run.
+  Builder? get parent => null;
 
   @override
   bool get isTypeVariable => true;