Skip to content

Commit 1dfe4cf

Browse files
fshcheglovCommit Queue
fshcheglov
authored and
Commit Queue
committed
Create _writeFragments and rename _readFragmentsById into _readFragments.
Change-Id: Ief992b70ff5af923dac75c7553683f6e2ed93a0e Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/442171 Commit-Queue: Konstantin Shcheglov <[email protected]> Reviewed-by: Samuel Rawlins <[email protected]> Reviewed-by: Konstantin Shcheglov <[email protected]>
1 parent 4ac4ce7 commit 1dfe4cf

File tree

2 files changed

+31
-37
lines changed

2 files changed

+31
-37
lines changed

‎pkg/analyzer/lib/src/summary2/bundle_reader.dart‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ class LibraryReader {
264264
void _readClassElements() {
265265
_libraryElement.classes = _reader.readTypedList(() {
266266
var reference = _readReference();
267-
var fragments = _readFragmentsById<ClassFragmentImpl>();
267+
var fragments = _readFragments<ClassFragmentImpl>();
268268
// TODO(scheglov): link fragments.
269269
var element = ClassElementImpl(reference, fragments.first);
270270
element.readModifiers(_reader);
@@ -340,7 +340,7 @@ class LibraryReader {
340340
List<ConstructorElementImpl> _readConstructorElements() {
341341
return _reader.readTypedList(() {
342342
var reference = _readReference();
343-
var fragments = _readFragmentsById<ConstructorFragmentImpl>();
343+
var fragments = _readFragments<ConstructorFragmentImpl>();
344344
// TODO(scheglov): link fragments.
345345
var element = ConstructorElementImpl(
346346
name: fragments.first.name,
@@ -478,7 +478,7 @@ class LibraryReader {
478478
void _readEnumElements() {
479479
_libraryElement.enums = _reader.readTypedList(() {
480480
var reference = _readReference();
481-
var fragments = _readFragmentsById<EnumFragmentImpl>();
481+
var fragments = _readFragments<EnumFragmentImpl>();
482482
// TODO(scheglov): link fragments.
483483
var element = EnumElementImpl(reference, fragments.first);
484484

@@ -563,7 +563,7 @@ class LibraryReader {
563563
void _readExtensionElements() {
564564
_libraryElement.extensions = _reader.readTypedList(() {
565565
var reference = _readReference();
566-
var fragments = _readFragmentsById<ExtensionFragmentImpl>();
566+
var fragments = _readFragments<ExtensionFragmentImpl>();
567567
// TODO(scheglov): link fragments.
568568
var element = ExtensionElementImpl(reference, fragments.first);
569569

@@ -621,7 +621,7 @@ class LibraryReader {
621621
void _readExtensionTypeElements() {
622622
_libraryElement.extensionTypes = _reader.readTypedList(() {
623623
var reference = _readReference();
624-
var fragments = _readFragmentsById<ExtensionTypeFragmentImpl>();
624+
var fragments = _readFragments<ExtensionTypeFragmentImpl>();
625625
// TODO(scheglov): link fragments.
626626
var element = ExtensionTypeElementImpl(reference, fragments.first);
627627

@@ -690,7 +690,7 @@ class LibraryReader {
690690
List<FieldElementImpl> _readFieldElements() {
691691
return _reader.readTypedList(() {
692692
var reference = _readReference();
693-
var fragments = _readFragmentsById<FieldFragmentImpl>();
693+
var fragments = _readFragments<FieldFragmentImpl>();
694694
// TODO(scheglov): link fragments.
695695
var element = FieldElementImpl(
696696
reference: reference,
@@ -776,14 +776,14 @@ class LibraryReader {
776776
return _reader.readOptionalStringReference();
777777
}
778778

779-
List<T> _readFragmentsById<T extends FragmentImpl>() {
779+
List<T> _readFragments<T extends FragmentImpl>() {
780780
return _reader.readTypedList(_readFragmentById);
781781
}
782782

783783
List<GetterElementImpl> _readGetterElements() {
784784
return _reader.readTypedList(() {
785785
var reference = _readReference();
786-
var fragments = _readFragmentsById<GetterFragmentImpl>();
786+
var fragments = _readFragments<GetterFragmentImpl>();
787787
// TODO(scheglov): link fragments.
788788
var element = GetterElementImpl(reference, fragments.first);
789789
element.readModifiers(_reader);
@@ -907,7 +907,7 @@ class LibraryReader {
907907
List<MethodElementImpl> _readMethodElements() {
908908
return _reader.readTypedList(() {
909909
var reference = _readReference();
910-
var fragments = _readFragmentsById<MethodFragmentImpl>();
910+
var fragments = _readFragments<MethodFragmentImpl>();
911911
// TODO(scheglov): link fragments.
912912
var element = MethodElementImpl(
913913
name: fragments.first.name,
@@ -970,7 +970,7 @@ class LibraryReader {
970970
void _readMixinElements() {
971971
_libraryElement.mixins = _reader.readTypedList(() {
972972
var reference = _readReference();
973-
var fragments = _readFragmentsById<MixinFragmentImpl>();
973+
var fragments = _readFragments<MixinFragmentImpl>();
974974
// TODO(scheglov): link fragments.
975975
var element = MixinElementImpl(reference, fragments.first);
976976
element.readModifiers(_reader);
@@ -1108,7 +1108,7 @@ class LibraryReader {
11081108
List<SetterElementImpl> _readSetterElements() {
11091109
return _reader.readTypedList(() {
11101110
var reference = _readReference();
1111-
var fragments = _readFragmentsById<SetterFragmentImpl>();
1111+
var fragments = _readFragments<SetterFragmentImpl>();
11121112
// TODO(scheglov): link fragments.
11131113
var element = SetterElementImpl(reference, fragments.first);
11141114
element.readModifiers(_reader);
@@ -1191,7 +1191,7 @@ class LibraryReader {
11911191
void _readTopLevelFunctionElements() {
11921192
_libraryElement.topLevelFunctions = _reader.readTypedList(() {
11931193
var reference = _readReference();
1194-
var fragments = _readFragmentsById<TopLevelFunctionFragmentImpl>();
1194+
var fragments = _readFragments<TopLevelFunctionFragmentImpl>();
11951195
// TODO(scheglov): link fragments.
11961196
var element = TopLevelFunctionElementImpl(reference, fragments.first);
11971197

@@ -1253,7 +1253,7 @@ class LibraryReader {
12531253
void _readTopLevelVariableElements() {
12541254
_libraryElement.topLevelVariables = _reader.readTypedList(() {
12551255
var reference = _readReference();
1256-
var fragments = _readFragmentsById<TopLevelVariableFragmentImpl>();
1256+
var fragments = _readFragments<TopLevelVariableFragmentImpl>();
12571257
// TODO(scheglov): link fragments.
12581258
var element = TopLevelVariableElementImpl(reference, fragments.first);
12591259

@@ -1293,7 +1293,7 @@ class LibraryReader {
12931293
void _readTypeAliasElements() {
12941294
_libraryElement.typeAliases = _reader.readTypedList(() {
12951295
var reference = _readReference();
1296-
var fragments = _readFragmentsById<TypeAliasFragmentImpl>();
1296+
var fragments = _readFragments<TypeAliasFragmentImpl>();
12971297
var element = TypeAliasElementImpl(reference, fragments.first);
12981298

12991299
element.deferReadResolution(

‎pkg/analyzer/lib/src/summary2/bundle_writer.dart‎

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class BundleWriter {
122122
// TODO(scheglov): extract
123123
_sink.writeList(libraryElement.topLevelVariables, (element) {
124124
_writeReference(element.reference);
125-
_sink.writeList(element.fragments, _writeFragmentId);
125+
_writeFragments(element.fragments);
126126
_writeElementResolution(() {
127127
_resolutionSink.writeType(element.type);
128128
});
@@ -148,9 +148,7 @@ class BundleWriter {
148148
void _writeClassElements(List<ClassElementImpl> elements) {
149149
_sink.writeList(elements, (element) {
150150
_writeReference(element.reference);
151-
_sink.writeList(element.fragments, (fragment) {
152-
_writeFragmentId(fragment);
153-
});
151+
_writeFragments(element.fragments);
154152
element.writeModifiers(_sink);
155153

156154
// We read members lazily.
@@ -197,7 +195,7 @@ class BundleWriter {
197195
void _writeConstructorElements(List<ConstructorElementImpl> elements) {
198196
_sink.writeList(elements, (element) {
199197
_writeReference(element.reference);
200-
_sink.writeList(element.fragments, _writeFragmentId);
198+
_writeFragments(element.fragments);
201199
element.writeModifiers(_sink);
202200

203201
_writeElementResolution(() {
@@ -269,9 +267,7 @@ class BundleWriter {
269267
void _writeEnumElements(List<EnumElementImpl> elements) {
270268
_sink.writeList(elements, (element) {
271269
_writeReference(element.reference);
272-
_sink.writeList(element.fragments, (fragment) {
273-
_writeFragmentId(fragment);
274-
});
270+
_writeFragments(element.fragments);
275271

276272
// TODO(scheglov): consider reading lazily
277273
_resolutionSink.withTypeParameters(element.typeParameters, () {
@@ -331,9 +327,7 @@ class BundleWriter {
331327
void _writeExtensionElements(List<ExtensionElementImpl> elements) {
332328
_sink.writeList(elements, (element) {
333329
_writeReference(element.reference);
334-
_sink.writeList(element.fragments, (fragment) {
335-
_writeFragmentId(fragment);
336-
});
330+
_writeFragments(element.fragments);
337331

338332
// TODO(scheglov): consider reading lazily
339333
_resolutionSink.withTypeParameters(element.typeParameters, () {
@@ -367,9 +361,7 @@ class BundleWriter {
367361
void _writeExtensionTypeElements(List<ExtensionTypeElementImpl> elements) {
368362
_sink.writeList(elements, (element) {
369363
_writeReference(element.reference);
370-
_sink.writeList(element.fragments, (fragment) {
371-
_writeFragmentId(fragment);
372-
});
364+
_writeFragments(element.fragments);
373365

374366
// TODO(scheglov): consider reading lazily
375367
_resolutionSink.withTypeParameters(element.typeParameters, () {
@@ -416,7 +408,7 @@ class BundleWriter {
416408
void _writeFieldElements(List<FieldElementImpl> elements) {
417409
_sink.writeList(elements, (element) {
418410
_writeReference(element.reference);
419-
_sink.writeList(element.fragments, _writeFragmentId);
411+
_writeFragments(element.fragments);
420412
_writeElementResolution(() {
421413
_resolutionSink.writeType(element.type);
422414
});
@@ -476,10 +468,14 @@ class BundleWriter {
476468
_sink._writeOptionalStringReference(fragment.name);
477469
}
478470

471+
void _writeFragments(List<FragmentImpl> fragments) {
472+
_sink.writeList(fragments, _writeFragmentId);
473+
}
474+
479475
void _writeGetterElements(List<GetterElementImpl> elements) {
480476
_sink.writeList(elements, (element) {
481477
_writeReference(element.reference);
482-
_sink.writeList(element.fragments, _writeFragmentId);
478+
_writeFragments(element.fragments);
483479
element.writeModifiers(_sink);
484480

485481
_writeElementResolution(() {
@@ -541,7 +537,7 @@ class BundleWriter {
541537
void _writeMethodElements(List<MethodElementImpl> elements) {
542538
_sink.writeList(elements, (element) {
543539
_writeReference(element.reference);
544-
_sink.writeList(element.fragments, _writeFragmentId);
540+
_writeFragments(element.fragments);
545541
element.writeModifiers(_sink);
546542
_sink._writeTopLevelInferenceError(element.typeInferenceError);
547543

@@ -566,9 +562,7 @@ class BundleWriter {
566562
void _writeMixinElements(List<MixinElementImpl> elements) {
567563
_sink.writeList(elements, (element) {
568564
_writeReference(element.reference);
569-
_sink.writeList(element.fragments, (fragment) {
570-
_writeFragmentId(fragment);
571-
});
565+
_writeFragments(element.fragments);
572566
element.writeModifiers(_sink);
573567

574568
// TODO(scheglov): consider reading lazily
@@ -680,7 +674,7 @@ class BundleWriter {
680674
void _writeSetterElements(List<SetterElementImpl> elements) {
681675
_sink.writeList(elements, (element) {
682676
_writeReference(element.reference);
683-
_sink.writeList(element.fragments, _writeFragmentId);
677+
_writeFragments(element.fragments);
684678
element.writeModifiers(_sink);
685679

686680
_writeElementResolution(() {
@@ -715,7 +709,7 @@ class BundleWriter {
715709
) {
716710
_sink.writeList(elements, (element) {
717711
_writeReference(element.reference);
718-
_sink.writeList(element.fragments, _writeFragmentId);
712+
_writeFragments(element.fragments);
719713

720714
_writeElementResolution(() {
721715
_resolutionSink.withTypeParameters(element.typeParameters, () {
@@ -744,7 +738,7 @@ class BundleWriter {
744738
void _writeTypeAliasElements(List<TypeAliasElementImpl> elements) {
745739
_sink.writeList(elements, (element) {
746740
_writeReference(element.reference);
747-
_sink.writeList(element.fragments, _writeFragmentId);
741+
_writeFragments(element.fragments);
748742

749743
_writeElementResolution(() {
750744
_resolutionSink.withTypeParameters(element.typeParameters, () {

0 commit comments

Comments
 (0)