Fine. Remove unused libraryUri / name.
I added them speculatively while working on initial version, and
did not actually use for anything.
Change-Id: Ib2bcb3ac5c16634392e956bd2dc6e99523f27479
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/420163
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
Reviewed-by: Paul Berry <paulberry@google.com>
diff --git a/pkg/analyzer/lib/src/fine/library_manifest.dart b/pkg/analyzer/lib/src/fine/library_manifest.dart
index 41b9de7..33e5c92 100644
--- a/pkg/analyzer/lib/src/fine/library_manifest.dart
+++ b/pkg/analyzer/lib/src/fine/library_manifest.dart
@@ -111,7 +111,6 @@
}) {
var item = _getOrBuildElementItem(element, () {
return ClassItem.fromElement(
- name: lookupName,
id: ManifestItemId.generate(),
context: encodingContext,
element: element,
@@ -150,7 +149,6 @@
var item = _getOrBuildElementItem(element, () {
return InstanceItemGetterItem.fromElement(
- name: lookupName,
id: ManifestItemId.generate(),
context: encodingContext,
element: element,
@@ -193,7 +191,6 @@
var item = _getOrBuildElementItem(element, () {
return InstanceItemMethodItem.fromElement(
- name: lookupName,
id: ManifestItemId.generate(),
context: encodingContext,
element: element,
@@ -240,7 +237,6 @@
var item = _getOrBuildElementItem(element, () {
return InterfaceItemConstructorItem.fromElement(
- name: lookupName,
id: ManifestItemId.generate(),
context: encodingContext,
element: element,
@@ -312,8 +308,6 @@
continue;
}
manifest.items[name] = ExportItem(
- libraryUri: libraryUri,
- name: name,
id: id,
);
}
@@ -328,7 +322,6 @@
}) {
var item = _getOrBuildElementItem(element, () {
return TopLevelFunctionItem.fromElement(
- name: lookupName,
id: ManifestItemId.generate(),
context: encodingContext,
element: element,
@@ -345,7 +338,6 @@
}) {
var item = _getOrBuildElementItem(element, () {
return TopLevelGetterItem.fromElement(
- name: lookupName,
id: ManifestItemId.generate(),
context: encodingContext,
element: element,
@@ -362,7 +354,6 @@
}) {
var item = _getOrBuildElementItem(element, () {
return TopLevelSetterItem.fromElement(
- name: lookupName,
id: ManifestItemId.generate(),
context: encodingContext,
element: element,
diff --git a/pkg/analyzer/lib/src/fine/manifest_item.dart b/pkg/analyzer/lib/src/fine/manifest_item.dart
index 7819baf..5a3f00b 100644
--- a/pkg/analyzer/lib/src/fine/manifest_item.dart
+++ b/pkg/analyzer/lib/src/fine/manifest_item.dart
@@ -15,8 +15,6 @@
class ClassItem extends InterfaceItem {
ClassItem({
- required super.libraryUri,
- required super.name,
required super.id,
required super.typeParameters,
required super.supertype,
@@ -26,7 +24,6 @@
});
factory ClassItem.fromElement({
- required LookupName name,
required ManifestItemId id,
required EncodeContext context,
required ClassElementImpl2 element,
@@ -35,8 +32,6 @@
element.typeParameters2,
(typeParameters) {
return ClassItem(
- libraryUri: element.library2.uri,
- name: name,
id: id,
typeParameters: typeParameters,
supertype: element.supertype?.encode(context),
@@ -50,8 +45,6 @@
factory ClassItem.read(SummaryDataReader reader) {
return ClassItem(
- libraryUri: reader.readUri(),
- name: LookupName.read(reader),
id: ManifestItemId.read(reader),
typeParameters: ManifestTypeParameter.readList(reader),
members: InstanceItem._readMembers(reader),
@@ -74,15 +67,11 @@
class ExportItem extends TopLevelItem {
ExportItem({
- required super.libraryUri,
- required super.name,
required super.id,
});
factory ExportItem.read(SummaryDataReader reader) {
return ExportItem(
- libraryUri: reader.readUri(),
- name: LookupName.read(reader),
id: ManifestItemId.read(reader),
);
}
@@ -100,8 +89,6 @@
final Map<LookupName, InstanceItemMemberItem> members;
InstanceItem({
- required super.libraryUri,
- required super.name,
required super.id,
required this.typeParameters,
required this.members,
@@ -132,20 +119,17 @@
final ManifestType returnType;
InstanceItemGetterItem({
- required super.name,
required super.id,
required super.isStatic,
required this.returnType,
});
factory InstanceItemGetterItem.fromElement({
- required LookupName name,
required ManifestItemId id,
required EncodeContext context,
required GetterElement2OrMember element,
}) {
return InstanceItemGetterItem(
- name: name,
id: id,
isStatic: element.isStatic,
returnType: element.returnType.encode(context),
@@ -154,7 +138,6 @@
factory InstanceItemGetterItem.read(SummaryDataReader reader) {
return InstanceItemGetterItem(
- name: LookupName.read(reader),
id: ManifestItemId.read(reader),
isStatic: reader.readBool(),
returnType: ManifestType.read(reader),
@@ -187,7 +170,6 @@
final bool isStatic;
InstanceItemMemberItem({
- required super.name,
required super.id,
required this.isStatic,
});
@@ -215,20 +197,17 @@
final ManifestFunctionType functionType;
InstanceItemMethodItem({
- required super.name,
required super.id,
required super.isStatic,
required this.functionType,
});
factory InstanceItemMethodItem.fromElement({
- required LookupName name,
required ManifestItemId id,
required EncodeContext context,
required MethodElement2OrMember element,
}) {
return InstanceItemMethodItem(
- name: name,
id: id,
isStatic: element.isStatic,
functionType: element.type.encode(context),
@@ -237,7 +216,6 @@
factory InstanceItemMethodItem.read(SummaryDataReader reader) {
return InstanceItemMethodItem(
- name: LookupName.read(reader),
id: ManifestItemId.read(reader),
isStatic: reader.readBool(),
functionType: ManifestFunctionType.read(reader),
@@ -273,8 +251,6 @@
final List<ManifestType> mixins;
InterfaceItem({
- required super.libraryUri,
- required super.name,
required super.id,
required super.typeParameters,
required super.members,
@@ -309,7 +285,6 @@
final ManifestFunctionType functionType;
InterfaceItemConstructorItem({
- required super.name,
required super.id,
required super.isStatic,
required this.isConst,
@@ -318,14 +293,12 @@
});
factory InterfaceItemConstructorItem.fromElement({
- required LookupName name,
required ManifestItemId id,
required EncodeContext context,
required ConstructorElementImpl2 element,
}) {
// TODO(scheglov): initializers
return InterfaceItemConstructorItem(
- name: name,
id: id,
isStatic: false,
isConst: element.isConst,
@@ -336,7 +309,6 @@
factory InterfaceItemConstructorItem.read(SummaryDataReader reader) {
return InterfaceItemConstructorItem(
- name: LookupName.read(reader),
id: ManifestItemId.read(reader),
isStatic: reader.readBool(),
isConst: reader.readBool(),
@@ -408,19 +380,14 @@
}
sealed class ManifestItem {
- /// The name of the item, mostly for debugging.
- final LookupName name;
-
/// The unique identifier of this item.
final ManifestItemId id;
ManifestItem({
- required this.name,
required this.id,
});
void write(BufferedSink sink) {
- name.write(sink);
id.write(sink);
}
}
@@ -475,21 +442,16 @@
final ManifestFunctionType functionType;
TopLevelFunctionItem({
- required super.libraryUri,
- required super.name,
required super.id,
required this.functionType,
});
factory TopLevelFunctionItem.fromElement({
- required LookupName name,
required ManifestItemId id,
required EncodeContext context,
required TopLevelFunctionElementImpl element,
}) {
return TopLevelFunctionItem(
- libraryUri: element.library2.uri,
- name: name,
id: id,
functionType: element.type.encode(context),
);
@@ -497,8 +459,6 @@
factory TopLevelFunctionItem.read(SummaryDataReader reader) {
return TopLevelFunctionItem(
- libraryUri: reader.readUri(),
- name: LookupName.read(reader),
id: ManifestItemId.read(reader),
functionType: ManifestFunctionType.read(reader),
);
@@ -529,8 +489,6 @@
final ManifestNode? constInitializer;
TopLevelGetterItem({
- required super.libraryUri,
- required super.name,
required super.id,
required this.metadata,
required this.returnType,
@@ -538,14 +496,11 @@
});
factory TopLevelGetterItem.fromElement({
- required LookupName name,
required ManifestItemId id,
required EncodeContext context,
required GetterElementImpl element,
}) {
return TopLevelGetterItem(
- libraryUri: element.library2.uri,
- name: name,
id: id,
metadata: ManifestMetadata.encode(context, element.metadata2),
returnType: element.returnType.encode(context),
@@ -555,8 +510,6 @@
factory TopLevelGetterItem.read(SummaryDataReader reader) {
return TopLevelGetterItem(
- libraryUri: reader.readUri(),
- name: LookupName.read(reader),
id: ManifestItemId.read(reader),
metadata: ManifestMetadata.read(reader),
returnType: ManifestType.read(reader),
@@ -593,12 +546,7 @@
}
sealed class TopLevelItem extends ManifestItem {
- /// The URI of the declaring library, mostly for debugging.
- final Uri libraryUri;
-
TopLevelItem({
- required this.libraryUri,
- required super.name,
required super.id,
});
@@ -617,12 +565,6 @@
return TopLevelSetterItem.read(reader);
}
}
-
- @override
- void write(BufferedSink sink) {
- sink.writeUri(libraryUri);
- super.write(sink);
- }
}
class TopLevelSetterItem extends TopLevelItem {
@@ -630,22 +572,17 @@
final ManifestType valueType;
TopLevelSetterItem({
- required super.libraryUri,
- required super.name,
required super.id,
required this.metadata,
required this.valueType,
});
factory TopLevelSetterItem.fromElement({
- required LookupName name,
required ManifestItemId id,
required EncodeContext context,
required SetterElementImpl element,
}) {
return TopLevelSetterItem(
- libraryUri: element.library2.uri,
- name: name,
id: id,
metadata: ManifestMetadata.encode(context, element.metadata2),
valueType: element.formalParameters[0].type.encode(context),
@@ -654,8 +591,6 @@
factory TopLevelSetterItem.read(SummaryDataReader reader) {
return TopLevelSetterItem(
- libraryUri: reader.readUri(),
- name: LookupName.read(reader),
id: ManifestItemId.read(reader),
metadata: ManifestMetadata.read(reader),
valueType: ManifestType.read(reader),
diff --git a/pkg/analyzer/test/src/dart/analysis/result_printer.dart b/pkg/analyzer/test/src/dart/analysis/result_printer.dart
index b112b86..8848ec6 100644
--- a/pkg/analyzer/test/src/dart/analysis/result_printer.dart
+++ b/pkg/analyzer/test/src/dart/analysis/result_printer.dart
@@ -765,17 +765,11 @@
});
}
- void _writeExportItem(ExportItem item) {
- if (configuration.withElementManifests) {
- sink.withIndent(() {
- sink.writeln('libraryUri: ${item.libraryUri}');
- });
- }
- }
+ void _writeExportItem(ExportItem item) {}
void _writeInstanceItemMember(LookupName name, InstanceItemMemberItem item) {
if (configuration.ignoredManifestInstanceMemberNames
- .contains(item.name.asString)) {
+ .contains(name.asString)) {
return;
}
