Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Prepare to move --delete-tostring-package-uri option to Dart SDK #26196

Merged
alexmarkov merged 3 commits into from
May 17, 2021
Merged

Prepare to move --delete-tostring-package-uri option to Dart SDK #26196

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6bbb2ba
Prepare to move --delete-tostring-package-uri option to Dart SDK
alexmarkov May 17, 2021
cb6a4a5
Add TODO
alexmarkov May 17, 2021
ba27af6
Format TODO
alexmarkov May 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 22 additions & 9 deletions flutter_frontend_server/lib/server.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,21 @@ Future<int> starter(
frontend.ProgramTransformer transformer,
}) async {
ArgResults options;
frontend.argParser.addMultiOption(
'delete-tostring-package-uri',
help: 'Replaces implementations of `toString` with `super.toString()` for '
// TODO(alexmarkov): Remove handling of --delete-tostring-package-uri option
// after it is added to Dart SDK,
// https://github.com/dart-lang/sdk/issues/46022.
final bool handleDeleteToString =
!frontend.argParser.options.containsKey('delete-tostring-package-uri');
if (handleDeleteToString) {
frontend.argParser.addMultiOption(
'delete-tostring-package-uri',
help:
'Replaces implementations of `toString` with `super.toString()` for '
'specified package',
valueHelp: 'dart:ui',
defaultsTo: const <String>[],
);
valueHelp: 'dart:ui',
defaultsTo: const <String>[],
);
}
try {
options = frontend.argParser.parse(args);
} catch (error) {
Expand All @@ -126,7 +134,8 @@ Future<int> starter(
return 1;
}

final Set<String> deleteToStringPackageUris = (options['delete-tostring-package-uri'] as List<String>).toSet();
final Set<String> deleteToStringPackageUris =
(options['delete-tostring-package-uri'] as List<String>).toSet();

if (options['train'] as bool) {
if (!options.rest.isNotEmpty) {
Expand All @@ -150,7 +159,9 @@ Future<int> starter(
]);
compiler ??= _FlutterFrontendCompiler(
output,
transformer: frontend.ToStringTransformer(null, deleteToStringPackageUris),
transformer: handleDeleteToString
? frontend.ToStringTransformer(null, deleteToStringPackageUris)
: null,
);

await compiler.compile(input, options);
Expand All @@ -170,7 +181,9 @@ Future<int> starter(
}

compiler ??= _FlutterFrontendCompiler(output,
transformer: frontend.ToStringTransformer(transformer, deleteToStringPackageUris),
transformer: handleDeleteToString
? frontend.ToStringTransformer(transformer, deleteToStringPackageUris)
: null,
useDebuggerModuleNames: options['debugger-module-names'] as bool,
emitDebugMetadata: options['experimental-emit-debug-metadata'] as bool,
unsafePackageSerialization:
Expand Down