Skip to content

Commit f14f177

Browse files
scheglovCommit Queue
authored andcommitted
Fine. Remove _InstanceItemMemberItemKind and related.
Change-Id: I5c3e4912c87e034edc4c5fa412873047998e95ba Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/448721 Commit-Queue: Konstantin Shcheglov <[email protected]> Reviewed-by: Johnni Winther <[email protected]>
1 parent 6516829 commit f14f177

File tree

2 files changed

+1
-51
lines changed

2 files changed

+1
-51
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ testFineAfterLibraryAnalyzerHook;
106106
// TODO(scheglov): Clean up the list of implicitly analyzed files.
107107
class AnalysisDriver {
108108
/// The version of data format, should be incremented on every format change.
109-
static const int DATA_VERSION = 543;
109+
static const int DATA_VERSION = 544;
110110

111111
/// The number of exception contexts allowed to write. Once this field is
112112
/// zero, we stop writing any new exception contexts in this process.

pkg/analyzer/lib/src/fine/manifest_item.dart

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -689,11 +689,6 @@ class InstanceItemFieldItem extends InstanceItemMemberItem<FieldElementImpl> {
689689
constInitializer.writeOptional(sink);
690690
}
691691

692-
@override
693-
void writeKind(BufferedSink sink) {
694-
sink.writeEnum(_InstanceItemMemberItemKind.field);
695-
}
696-
697692
static Map<LookupName, InstanceItemFieldItem> readMap(
698693
SummaryDataReader reader,
699694
) {
@@ -754,11 +749,6 @@ class InstanceItemGetterItem extends InstanceItemMemberItem<GetterElementImpl> {
754749
returnType.write(sink);
755750
}
756751

757-
@override
758-
void writeKind(BufferedSink sink) {
759-
sink.writeEnum(_InstanceItemMemberItemKind.getter);
760-
}
761-
762752
static Map<LookupName, InstanceItemGetterItem> readMap(
763753
SummaryDataReader reader,
764754
) {
@@ -805,29 +795,6 @@ sealed class InstanceItemMemberItem<E extends ElementImpl>
805795
super.write(sink);
806796
sink.writeBool(isStatic);
807797
}
808-
809-
void writeKind(BufferedSink sink);
810-
811-
void writeWithKind(BufferedSink sink) {
812-
writeKind(sink);
813-
write(sink);
814-
}
815-
816-
static InstanceItemMemberItem<ElementImpl> read(SummaryDataReader reader) {
817-
var kind = reader.readEnum(_InstanceItemMemberItemKind.values);
818-
switch (kind) {
819-
case _InstanceItemMemberItemKind.field:
820-
return InstanceItemFieldItem.read(reader);
821-
case _InstanceItemMemberItemKind.getter:
822-
return InstanceItemGetterItem.read(reader);
823-
case _InstanceItemMemberItemKind.method:
824-
return InstanceItemMethodItem.read(reader);
825-
case _InstanceItemMemberItemKind.setter:
826-
return InstanceItemSetterItem.read(reader);
827-
case _InstanceItemMemberItemKind.constructor:
828-
return InterfaceItemConstructorItem.read(reader);
829-
}
830-
}
831798
}
832799

833800
class InstanceItemMethodItem extends InstanceItemMemberItem<MethodElementImpl> {
@@ -877,11 +844,6 @@ class InstanceItemMethodItem extends InstanceItemMemberItem<MethodElementImpl> {
877844
functionType.writeNoTag(sink);
878845
}
879846

880-
@override
881-
void writeKind(BufferedSink sink) {
882-
sink.writeEnum(_InstanceItemMemberItemKind.method);
883-
}
884-
885847
static Map<LookupName, InstanceItemMethodItem> readMap(
886848
SummaryDataReader reader,
887849
) {
@@ -942,11 +904,6 @@ class InstanceItemSetterItem extends InstanceItemMemberItem<SetterElementImpl> {
942904
functionType.writeNoTag(sink);
943905
}
944906

945-
@override
946-
void writeKind(BufferedSink sink) {
947-
sink.writeEnum(_InstanceItemMemberItemKind.setter);
948-
}
949-
950907
static Map<LookupName, InstanceItemSetterItem> readMap(
951908
SummaryDataReader reader,
952909
) {
@@ -1095,11 +1052,6 @@ class InterfaceItemConstructorItem
10951052
constantInitializers.writeList(sink);
10961053
}
10971054

1098-
@override
1099-
void writeKind(BufferedSink sink) {
1100-
sink.writeEnum(_InstanceItemMemberItemKind.constructor);
1101-
}
1102-
11031055
static Map<LookupName, InterfaceItemConstructorItem> readMap(
11041056
SummaryDataReader reader,
11051057
) {
@@ -1708,8 +1660,6 @@ class TypeAliasItem extends TopLevelItem<TypeAliasElementImpl> {
17081660
}
17091661
}
17101662

1711-
enum _InstanceItemMemberItemKind { field, constructor, method, getter, setter }
1712-
17131663
extension LookupNameToIdMapExtension on Map<LookupName, ManifestItemId> {
17141664
void write(BufferedSink sink) {
17151665
sink.writeMap(

0 commit comments

Comments
 (0)