Extract GetDriverEvent, and print method/name on the same line.

Change-Id: I0ccf7131cf1fc144212a28ba4046802bdd48557c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/346903
Reviewed-by: Phil Quitslund <pquitslund@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
This commit is contained in:
Konstantin Shcheglov 2024-01-17 22:44:01 +00:00 committed by Commit Queue
parent c5fb584a75
commit f98574ee10
2 changed files with 314 additions and 400 deletions

File diff suppressed because it is too large Load diff

View file

@ -44,9 +44,8 @@ class DriverEventsPrinter {
} }
void _writeErrorsEvent(GetErrorsEvent event) { void _writeErrorsEvent(GetErrorsEvent event) {
sink.writelnWithIndent('[future] getErrors'); _writeGetEvent(event);
sink.withIndent(() { sink.withIndent(() {
sink.writelnWithIndent('name: ${event.name}');
_writeErrorsResult(event.result); _writeErrorsResult(event.result);
}); });
} }
@ -105,9 +104,8 @@ class DriverEventsPrinter {
} }
void _writeGetCachedResolvedUnit(GetCachedResolvedUnitEvent event) { void _writeGetCachedResolvedUnit(GetCachedResolvedUnitEvent event) {
sink.writelnWithIndent('[future] getCachedResolvedUnit'); _writeGetEvent(event);
sink.withIndent(() { sink.withIndent(() {
sink.writelnWithIndent('name: ${event.name}');
if (event.result case final result?) { if (event.result case final result?) {
_writeResolvedUnitResult(result); _writeResolvedUnitResult(result);
} else { } else {
@ -116,40 +114,40 @@ class DriverEventsPrinter {
}); });
} }
void _writeGetEvent(GetDriverEvent event) {
sink.writelnWithIndent('[future] ${event.methodName} ${event.name}');
}
void _writeGetLibraryByUriEvent(GetLibraryByUriEvent event) { void _writeGetLibraryByUriEvent(GetLibraryByUriEvent event) {
sink.writelnWithIndent('[future] getLibraryByUri'); _writeGetEvent(event);
sink.withIndent(() { sink.withIndent(() {
sink.writelnWithIndent('name: ${event.name}');
_writeLibraryElementResult(event.result); _writeLibraryElementResult(event.result);
}); });
} }
void _writeGetResolvedLibrary(GetResolvedLibraryEvent event) { void _writeGetResolvedLibrary(GetResolvedLibraryEvent event) {
sink.writelnWithIndent('[future] getResolvedLibrary'); _writeGetEvent(event);
sink.withIndent(() { sink.withIndent(() {
sink.writelnWithIndent('name: ${event.name}');
_writeResolvedLibraryResult(event.result); _writeResolvedLibraryResult(event.result);
}); });
} }
void _writeGetResolvedLibraryByUri(GetResolvedLibraryByUriEvent event) { void _writeGetResolvedLibraryByUri(GetResolvedLibraryByUriEvent event) {
sink.writelnWithIndent('[future] getResolvedLibraryByUri'); _writeGetEvent(event);
sink.withIndent(() { sink.withIndent(() {
sink.writelnWithIndent('name: ${event.name}');
_writeResolvedLibraryResult(event.result); _writeResolvedLibraryResult(event.result);
}); });
} }
void _writeGetResolvedUnit(GetResolvedUnitEvent event) { void _writeGetResolvedUnit(GetResolvedUnitEvent event) {
sink.writelnWithIndent('[future] getResolvedUnit'); _writeGetEvent(event);
sink.withIndent(() { sink.withIndent(() {
sink.writelnWithIndent('name: ${event.name}');
_writeResolvedUnitResult(event.result); _writeResolvedUnitResult(event.result);
}); });
} }
void _writeGetUnitElementEvent(GetUnitElementEvent event) { void _writeGetUnitElementEvent(GetUnitElementEvent event) {
sink.writelnWithIndent('[future] getUnitElement'); _writeGetEvent(event);
sink.withIndent(() { sink.withIndent(() {
final result = event.result; final result = event.result;
switch (result) { switch (result) {
@ -162,9 +160,8 @@ class DriverEventsPrinter {
} }
void _writeIndexEvent(GetIndexEvent event) { void _writeIndexEvent(GetIndexEvent event) {
sink.writelnWithIndent('[future] getIndex'); _writeGetEvent(event);
sink.withIndent(() { sink.withIndent(() {
sink.writelnWithIndent('name: ${event.name}');
if (event.result case var result?) { if (event.result case var result?) {
sink.writeElements('strings', result.strings, (str) { sink.writeElements('strings', result.strings, (str) {
sink.writelnWithIndent(str); sink.writelnWithIndent(str);
@ -224,7 +221,7 @@ class DriverEventsPrinter {
final object = event.object; final object = event.object;
switch (object) { switch (object) {
case events.AnalyzeFile(): case events.AnalyzeFile():
sink.writelnWithIndent('[operation] AnalyzeFile'); sink.writelnWithIndent('[operation] analyzeFile');
sink.withIndent(() { sink.withIndent(() {
final file = object.file.resource; final file = object.file.resource;
sink.writelnWithIndent('file: ${file.posixPath}'); sink.writelnWithIndent('file: ${file.posixPath}');
@ -237,7 +234,7 @@ class DriverEventsPrinter {
_writeErrorsResult(object); _writeErrorsResult(object);
}); });
case events.GetErrorsFromBytes(): case events.GetErrorsFromBytes():
sink.writelnWithIndent('[operation] GetErrorsFromBytes'); sink.writelnWithIndent('[operation] getErrorsFromBytes');
sink.withIndent(() { sink.withIndent(() {
final file = object.file.resource; final file = object.file.resource;
sink.writelnWithIndent('file: ${file.posixPath}'); sink.writelnWithIndent('file: ${file.posixPath}');
@ -298,91 +295,117 @@ class DriverEventsPrinterConfiguration {
} }
/// The result of `getCachedResolvedUnit`. /// The result of `getCachedResolvedUnit`.
final class GetCachedResolvedUnitEvent extends DriverEvent { final class GetCachedResolvedUnitEvent extends GetDriverEvent {
final String name;
final SomeResolvedUnitResult? result; final SomeResolvedUnitResult? result;
GetCachedResolvedUnitEvent({ GetCachedResolvedUnitEvent({
required this.name, required super.name,
required this.result, required this.result,
}); });
@override
String get methodName => 'getCachedResolvedUnit';
}
sealed class GetDriverEvent extends DriverEvent {
final String name;
GetDriverEvent({
required this.name,
});
String get methodName;
} }
/// The result of `getErrors`. /// The result of `getErrors`.
final class GetErrorsEvent extends DriverEvent { final class GetErrorsEvent extends GetDriverEvent {
final String name;
final SomeErrorsResult result; final SomeErrorsResult result;
GetErrorsEvent({ GetErrorsEvent({
required this.name, required super.name,
required this.result, required this.result,
}); });
@override
String get methodName => 'getErrors';
} }
/// The result of `getIndex`. /// The result of `getIndex`.
final class GetIndexEvent extends DriverEvent { final class GetIndexEvent extends GetDriverEvent {
final String name;
final AnalysisDriverUnitIndex? result; final AnalysisDriverUnitIndex? result;
GetIndexEvent({ GetIndexEvent({
required this.name, required super.name,
required this.result, required this.result,
}); });
@override
String get methodName => 'getIndex';
} }
/// The result of `getLibraryByUri`. /// The result of `getLibraryByUri`.
final class GetLibraryByUriEvent extends DriverEvent { final class GetLibraryByUriEvent extends GetDriverEvent {
final String name;
final SomeLibraryElementResult result; final SomeLibraryElementResult result;
GetLibraryByUriEvent({ GetLibraryByUriEvent({
required this.name, required super.name,
required this.result, required this.result,
}); });
@override
String get methodName => 'getLibraryByUri';
} }
/// The result of `getResolvedLibraryByUri`. /// The result of `getResolvedLibraryByUri`.
final class GetResolvedLibraryByUriEvent extends DriverEvent { final class GetResolvedLibraryByUriEvent extends GetDriverEvent {
final String name;
final SomeResolvedLibraryResult result; final SomeResolvedLibraryResult result;
GetResolvedLibraryByUriEvent({ GetResolvedLibraryByUriEvent({
required this.name, required super.name,
required this.result, required this.result,
}); });
@override
String get methodName => 'getResolvedLibraryByUri';
} }
/// The result of `getResolvedLibrary`. /// The result of `getResolvedLibrary`.
final class GetResolvedLibraryEvent extends DriverEvent { final class GetResolvedLibraryEvent extends GetDriverEvent {
final String name;
final SomeResolvedLibraryResult result; final SomeResolvedLibraryResult result;
GetResolvedLibraryEvent({ GetResolvedLibraryEvent({
required this.name, required super.name,
required this.result, required this.result,
}); });
@override
String get methodName => 'getResolvedLibrary';
} }
/// The result of `getResolvedUnit`. /// The result of `getResolvedUnit`.
final class GetResolvedUnitEvent extends DriverEvent { final class GetResolvedUnitEvent extends GetDriverEvent {
final String name;
final SomeResolvedUnitResult result; final SomeResolvedUnitResult result;
GetResolvedUnitEvent({ GetResolvedUnitEvent({
required this.name, required super.name,
required this.result, required this.result,
}); });
@override
String get methodName => 'getResolvedUnit';
} }
/// The result of `getUnitElement`. /// The result of `getUnitElement`.
final class GetUnitElementEvent extends DriverEvent { final class GetUnitElementEvent extends GetDriverEvent {
final String name;
final SomeUnitElementResult result; final SomeUnitElementResult result;
GetUnitElementEvent({ GetUnitElementEvent({
required this.name, required super.name,
required this.result, required this.result,
}); });
@override
String get methodName => 'getUnitElement';
} }
class IdProvider { class IdProvider {