@@ -162,7 +162,7 @@ class GetterFragment implements Fragment, FunctionFragment {
162
162
}
163
163
164
164
BodyBuilderContext createBodyBuilderContext () {
165
- return new GetterFragmentBodyBuilderContext (
165
+ return new _GetterFragmentBodyBuilderContext (
166
166
this , builder.libraryBuilder, builder.declarationBuilder,
167
167
isDeclarationInstanceMember: builder.isDeclarationInstanceMember);
168
168
}
@@ -190,10 +190,10 @@ class GetterFragment implements Fragment, FunctionFragment {
190
190
void ensureTypes (
191
191
ClassMembersBuilder membersBuilder,
192
192
SourceClassBuilder enclosingClassBuilder,
193
- Set <ClassMember >? _getterOverrideDependencies ) {
194
- if (_getterOverrideDependencies != null ) {
193
+ Set <ClassMember >? getterOverrideDependencies ) {
194
+ if (getterOverrideDependencies != null ) {
195
195
membersBuilder.inferGetterType (
196
- enclosingClassBuilder, returnType, _getterOverrideDependencies ,
196
+ enclosingClassBuilder, returnType, getterOverrideDependencies ,
197
197
name: name,
198
198
fileUri: fileUri,
199
199
nameOffset: nameOffset,
@@ -204,7 +204,7 @@ class GetterFragment implements Fragment, FunctionFragment {
204
204
}
205
205
206
206
void checkTypes (SourceLibraryBuilder libraryBuilder,
207
- TypeEnvironment typeEnvironment, SourceProcedureBuilder ? setterBuilder,
207
+ TypeEnvironment typeEnvironment, SourcePropertyBuilder ? setterBuilder,
208
208
{required bool isAbstract, required bool isExternal}) {
209
209
_encoding.checkTypes (libraryBuilder, typeEnvironment, setterBuilder,
210
210
isAbstract: isAbstract, isExternal: isExternal);
@@ -296,58 +296,6 @@ sealed class _GetterEncoding implements InferredTypeListener {
296
296
{required bool isClassInstanceMember,
297
297
required bool createFileUriExpression});
298
298
299
- void _buildMetadataForOutlineExpressions (
300
- SourceLibraryBuilder libraryBuilder,
301
- LookupScope parentScope,
302
- BodyBuilderContext bodyBuilderContext,
303
- Annotatable annotatable,
304
- List <MetadataBuilder >? metadata,
305
- {required Uri fileUri,
306
- required bool createFileUriExpression}) {
307
- MetadataBuilder .buildAnnotations (annotatable, metadata, bodyBuilderContext,
308
- libraryBuilder, fileUri, parentScope,
309
- createFileUriExpression: createFileUriExpression);
310
- }
311
-
312
- void _buildTypeParametersForOutlineExpressions (
313
- ClassHierarchy classHierarchy,
314
- SourceLibraryBuilder libraryBuilder,
315
- BodyBuilderContext bodyBuilderContext,
316
- LookupScope typeParameterScope,
317
- List <NominalParameterBuilder >? typeParameters) {
318
- if (typeParameters != null ) {
319
- for (int i = 0 ; i < typeParameters.length; i++ ) {
320
- typeParameters[i].buildOutlineExpressions (libraryBuilder,
321
- bodyBuilderContext, classHierarchy, typeParameterScope);
322
- }
323
- }
324
- }
325
-
326
- void _buildFormalsForOutlineExpressions (
327
- SourceLibraryBuilder libraryBuilder,
328
- DeclarationBuilder ? declarationBuilder,
329
- List <FormalParameterBuilder >? formals,
330
- {required bool isClassInstanceMember}) {
331
- if (formals != null ) {
332
- for (FormalParameterBuilder formal in formals) {
333
- _buildFormalForOutlineExpressions (
334
- libraryBuilder, declarationBuilder, formal,
335
- isClassInstanceMember: isClassInstanceMember);
336
- }
337
- }
338
- }
339
-
340
- void _buildFormalForOutlineExpressions (SourceLibraryBuilder libraryBuilder,
341
- DeclarationBuilder ? declarationBuilder, FormalParameterBuilder formal,
342
- {required bool isClassInstanceMember}) {
343
- // For const constructors we need to include default parameter values
344
- // into the outline. For all other formals we need to call
345
- // buildOutlineExpressions to clear initializerToken to prevent
346
- // consuming too much memory.
347
- formal.buildOutlineExpressions (libraryBuilder, declarationBuilder,
348
- buildDefaultValue: isClassInstanceMember);
349
- }
350
-
351
299
LocalScope createFormalParameterScope (LookupScope typeParameterScope);
352
300
353
301
int computeDefaultTypes (ComputeDefaultTypeContext context,
@@ -363,7 +311,7 @@ sealed class _GetterEncoding implements InferredTypeListener {
363
311
VariableDeclaration getFormalParameter (int index);
364
312
365
313
void checkTypes (SourceLibraryBuilder libraryBuilder,
366
- TypeEnvironment typeEnvironment, SourceProcedureBuilder ? setterBuilder,
314
+ TypeEnvironment typeEnvironment, SourcePropertyBuilder ? setterBuilder,
367
315
{required bool isAbstract, required bool isExternal});
368
316
369
317
void checkVariance (
@@ -497,7 +445,7 @@ mixin _DirectGetterEncodingMixin implements _GetterEncoding {
497
445
498
446
@override
499
447
void checkTypes (SourceLibraryBuilder libraryBuilder,
500
- TypeEnvironment typeEnvironment, SourceProcedureBuilder ? setterBuilder,
448
+ TypeEnvironment typeEnvironment, SourcePropertyBuilder ? setterBuilder,
501
449
{required bool isAbstract, required bool isExternal}) {
502
450
List <TypeParameterBuilder >? typeParameters =
503
451
_fragment.declaredTypeParameters;
@@ -510,7 +458,7 @@ mixin _DirectGetterEncodingMixin implements _GetterEncoding {
510
458
isAbstract: isAbstract, isExternal: isExternal);
511
459
if (setterBuilder != null ) {
512
460
DartType getterType = function.returnType;
513
- DartType setterType = SourceProcedureBuilder .getSetterType (setterBuilder,
461
+ DartType setterType = SourcePropertyBuilder .getSetterType (setterBuilder,
514
462
getterExtensionTypeParameters: null );
515
463
libraryBuilder.checkGetterSetterTypes (typeEnvironment,
516
464
getterType: getterType,
@@ -763,7 +711,7 @@ mixin _ExtensionInstanceGetterEncodingMixin implements _GetterEncoding {
763
711
764
712
@override
765
713
void checkTypes (SourceLibraryBuilder libraryBuilder,
766
- TypeEnvironment typeEnvironment, SourceProcedureBuilder ? setterBuilder,
714
+ TypeEnvironment typeEnvironment, SourcePropertyBuilder ? setterBuilder,
767
715
{required bool isAbstract, required bool isExternal}) {
768
716
List <TypeParameterBuilder >? typeParameters =
769
717
_fragment.declaredTypeParameters;
@@ -776,7 +724,7 @@ mixin _ExtensionInstanceGetterEncodingMixin implements _GetterEncoding {
776
724
isAbstract: isAbstract, isExternal: isExternal);
777
725
if (setterBuilder != null ) {
778
726
DartType getterType = function.returnType;
779
- DartType setterType = SourceProcedureBuilder .getSetterType (setterBuilder,
727
+ DartType setterType = SourcePropertyBuilder .getSetterType (setterBuilder,
780
728
getterExtensionTypeParameters: function.typeParameters);
781
729
libraryBuilder.checkGetterSetterTypes (typeEnvironment,
782
730
getterType: getterType,
@@ -870,10 +818,10 @@ class _ExtensionTypeInstanceGetterEncoding extends _GetterEncoding
870
818
bool get _isExtensionTypeMember => true ;
871
819
}
872
820
873
- class GetterFragmentBodyBuilderContext extends BodyBuilderContext {
821
+ class _GetterFragmentBodyBuilderContext extends BodyBuilderContext {
874
822
final GetterFragment _fragment;
875
823
876
- GetterFragmentBodyBuilderContext (
824
+ _GetterFragmentBodyBuilderContext (
877
825
this ._fragment,
878
826
SourceLibraryBuilder libraryBuilder,
879
827
DeclarationBuilder ? declarationBuilder,
0 commit comments