[cfe] Remove modifiers from SourceMemberBuilder

- and isFinal from Builder

Change-Id: Ibfc3b29724279760c8c98fda4f5a7b24186ace2b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/391360
Reviewed-by: Jens Johansen <[email protected]>

Author: johnniwinther

pkg/front_end/lib/src/base/scope.dart

@@ -565,10 +565,6 @@ class AccessErrorBuilder extends ProblemBuilder {
   @override
   Builder? get parent => builder.parent;
 
-  @override
-  // Coverage-ignore(suite): Not run.
-  bool get isFinal => builder.isFinal;
-
   @override
   bool get isField => builder.isField;
 

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

@@ -32,8 +32,6 @@ abstract class Builder {
 
   bool get isField;
 
-  bool get isFinal;
-
   bool get isGetter;
 
   bool get isExternal;
@@ -287,10 +285,6 @@ abstract class BuilderImpl implements Builder {
   @override
   bool get isField => false;
 
-  @override
-  // Coverage-ignore(suite): Not run.
-  bool get isFinal => false;
-
   @override
   bool get isGetter => false;
 

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

@@ -117,7 +117,6 @@ abstract class ClassBuilder implements DeclarationBuilder, ClassMemberAccess {
 
   bool get isInterface;
 
-  @override
   bool get isFinal;
 
   bool get declaresConstConstructor;

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

@@ -148,9 +148,6 @@ class FormalParameterBuilder extends BuilderImpl
   @override
   bool get isConst => modifiers.isConst;
 
-  @override
-  bool get isFinal => modifiers.isFinal;
-
   // An initializing formal parameter might be final without its
   // VariableDeclaration being final. See
   // [ProcedureBuilder.computeFormalParameterInitializerScope]..
@@ -173,7 +170,7 @@ class FormalParameterBuilder extends BuilderImpl
           // `null` is used in [VariableDeclarationImpl] to signal an omitted
           // type.
           type: isTypeOmitted ? null : builtType,
-          isFinal: isFinal,
+          isFinal: modifiers.isFinal,
           isConst: false,
           isInitializingFormal: isInitializingFormal,
           isCovariantByDeclaration: isCovariantByDeclaration,

pkg/front_end/lib/src/dill/dill_member_builder.dart

@@ -156,10 +156,6 @@ class DillFieldBuilder extends DillMemberBuilder implements FieldBuilder {
   // Coverage-ignore(suite): Not run.
   bool get isConst => field.isConst;
 
-  @override
-  // Coverage-ignore(suite): Not run.
-  bool get isFinal => field.isFinal;
-
   @override
   bool get isStatic => field.isStatic;
 }

pkg/front_end/lib/src/kernel/kernel_variable_builder.dart

@@ -31,10 +31,6 @@ class VariableBuilderImpl extends BuilderImpl implements VariableBuilder {
   @override
   bool get isConst => variable.isConst;
 
-  @override
-  // Coverage-ignore(suite): Not run.
-  bool get isFinal => variable.isFinal;
-
   @override
   bool get isAssignable => variable.isAssignable;
 

pkg/front_end/lib/src/source/source_extension_builder.dart

@@ -132,10 +132,6 @@ class SourceExtensionBuilder extends ExtensionBuilderImpl
   // Coverage-ignore(suite): Not run.
   bool get isConst => _modifiers.isConst;
 
-  @override
-  // Coverage-ignore(suite): Not run.
-  bool get isFinal => _modifiers.isFinal;
-
   @override
   // Coverage-ignore(suite): Not run.
   bool get isStatic => _modifiers.isStatic;

pkg/front_end/lib/src/source/source_extension_type_declaration_builder.dart

@@ -151,10 +151,6 @@ class SourceExtensionTypeDeclarationBuilder
   // Coverage-ignore(suite): Not run.
   bool get isConst => _modifiers.isConst;
 
-  @override
-  // Coverage-ignore(suite): Not run.
-  bool get isFinal => _modifiers.isFinal;
-
   @override
   // Coverage-ignore(suite): Not run.
   bool get isStatic => _modifiers.isStatic;

pkg/front_end/lib/src/source/source_field_builder.dart

@@ -52,7 +52,6 @@ class SourceFieldBuilder extends SourceMemberBuilderImpl
 
   final MemberName _memberName;
 
-  @override
   final Modifiers modifiers;
 
   late FieldEncoding _fieldEncoding;
@@ -320,6 +319,26 @@ class SourceFieldBuilder extends SourceMemberBuilderImpl
   // Coverage-ignore(suite): Not run.
   Iterable<MetadataBuilder>? get metadataForTesting => metadata;
 
+  @override
+  bool get isAugmentation => modifiers.isAugment;
+
+  @override
+  bool get isExternal => modifiers.isExternal;
+
+  @override
+  bool get isAbstract => modifiers.isAbstract;
+
+  @override
+  bool get isConst => modifiers.isConst;
+
+  bool get isFinal => modifiers.isFinal;
+
+  @override
+  bool get isStatic => modifiers.isStatic;
+
+  @override
+  bool get isAugment => modifiers.isAugment;
+
   @override
   Builder get parent => declarationBuilder ?? libraryBuilder;
 

pkg/front_end/lib/src/source/source_function_builder.dart

@@ -121,7 +121,6 @@ abstract class SourceFunctionBuilderImpl extends SourceMemberBuilderImpl
   @override
   final List<MetadataBuilder>? metadata;
 
-  @override
   final Modifiers modifiers;
 
   @override
@@ -160,11 +159,26 @@ abstract class SourceFunctionBuilderImpl extends SourceMemberBuilderImpl
   AsyncMarker get asyncModifier;
 
   @override
-  bool get isConstructor => false;
+  bool get isAugmentation => modifiers.isAugment;
+
+  @override
+  bool get isExternal => modifiers.isExternal;
 
   @override
   bool get isAbstract => modifiers.isAbstract;
 
+  @override
+  bool get isConst => modifiers.isConst;
+
+  @override
+  bool get isStatic => modifiers.isStatic;
+
+  @override
+  bool get isAugment => modifiers.isAugment;
+
+  @override
+  bool get isConstructor => false;
+
   @override
   bool get isRegularMethod => identical(ProcedureKind.Method, kind);
 
@@ -180,9 +194,6 @@ abstract class SourceFunctionBuilderImpl extends SourceMemberBuilderImpl
   @override
   bool get isFactory => identical(ProcedureKind.Factory, kind);
 
-  @override
-  bool get isExternal => modifiers.isExternal;
-
   @override
   // Coverage-ignore(suite): Not run.
   bool get isAssignable => false;