Fine. Rename ManifestNode subclasses.
Change-Id: I2baa6f448635a78bb36b121aba2b64f599e96ee1
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/420020
Reviewed-by: Paul Berry <paulberry@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analyzer/lib/src/fine/manifest_ast.dart b/pkg/analyzer/lib/src/fine/manifest_ast.dart
index 078838d..8adf24c 100644
--- a/pkg/analyzer/lib/src/fine/manifest_ast.dart
+++ b/pkg/analyzer/lib/src/fine/manifest_ast.dart
@@ -8,29 +8,56 @@
import 'package:analyzer/src/summary2/data_reader.dart';
import 'package:analyzer/src/summary2/data_writer.dart';
-class ManifestAnnotation extends ManifestNode {
- final ManifestSimpleIdentifier name;
+sealed class ManifestNode {
+ bool match(MatchContext context, AstNode node);
- ManifestAnnotation({
+ void write(BufferedSink sink);
+
+ static ManifestNode encode(EncodeContext context, AstNode node) {
+ switch (node) {
+ case Annotation():
+ return ManifestNodeAnnotation.encode(context, node);
+ case SimpleIdentifier():
+ return ManifestNodeSimpleIdentifier.encode(context, node);
+ default:
+ throw UnimplementedError('(${node.runtimeType}) $node');
+ }
+ }
+
+ static ManifestNode read(SummaryDataReader reader) {
+ var kind = reader.readEnum(_ManifestNodeKind.values);
+ switch (kind) {
+ case _ManifestNodeKind.annotation:
+ return ManifestNodeAnnotation.read(reader);
+ case _ManifestNodeKind.simpleIdentifier:
+ return ManifestNodeSimpleIdentifier.read(reader);
+ }
+ }
+}
+
+class ManifestNodeAnnotation extends ManifestNode {
+ final ManifestNodeSimpleIdentifier name;
+
+ ManifestNodeAnnotation({
required this.name,
});
- factory ManifestAnnotation.encode(
+ factory ManifestNodeAnnotation.encode(
EncodeContext context,
Annotation node,
) {
if (node.name case SimpleIdentifier identifier) {
- return ManifestAnnotation(
- name: ManifestSimpleIdentifier.encode(context, identifier),
+ return ManifestNodeAnnotation(
+ name: ManifestNodeSimpleIdentifier.encode(context, identifier),
);
} else {
throw UnimplementedError('(${node.runtimeType}) $node');
}
}
- factory ManifestAnnotation.read(SummaryDataReader reader) {
- return ManifestAnnotation(
- name: ManifestSimpleIdentifier.read(reader),
+ factory ManifestNodeAnnotation.read(SummaryDataReader reader) {
+ return ManifestNodeAnnotation(
+ name: ManifestNodeSimpleIdentifier.read(reader),
);
}
@@ -54,56 +81,29 @@
}
}
-sealed class ManifestNode {
- bool match(MatchContext context, AstNode node);
-
- void write(BufferedSink sink);
-
- static ManifestNode encode(EncodeContext context, AstNode node) {
- switch (node) {
- case Annotation():
- return ManifestAnnotation.encode(context, node);
- case SimpleIdentifier():
- return ManifestSimpleIdentifier.encode(context, node);
- default:
- throw UnimplementedError('(${node.runtimeType}) $node');
- }
- }
-
- static ManifestNode read(SummaryDataReader reader) {
- var kind = reader.readEnum(_ManifestNodeKind.values);
- switch (kind) {
- case _ManifestNodeKind.annotation:
- return ManifestAnnotation.read(reader);
- case _ManifestNodeKind.simpleIdentifier:
- return ManifestSimpleIdentifier.read(reader);
- }
- }
-}
-
-class ManifestSimpleIdentifier extends ManifestNode {
+class ManifestNodeSimpleIdentifier extends ManifestNode {
final String name;
final ManifestElement? element;
- ManifestSimpleIdentifier({
+ ManifestNodeSimpleIdentifier({
required this.name,
required this.element,
});
- factory ManifestSimpleIdentifier.encode(
+ factory ManifestNodeSimpleIdentifier.encode(
EncodeContext context,
SimpleIdentifier node,
) {
var element = node.element;
- return ManifestSimpleIdentifier(
+ return ManifestNodeSimpleIdentifier(
name: node.name,
element:
element != null ? ManifestElement.encode(context, element) : null,
);
}
- factory ManifestSimpleIdentifier.read(SummaryDataReader reader) {
- return ManifestSimpleIdentifier(
+ factory ManifestNodeSimpleIdentifier.read(SummaryDataReader reader) {
+ return ManifestNodeSimpleIdentifier(
name: reader.readStringUtf8(),
element: reader.readOptionalObject(
() => ManifestElement.read(reader),