From 6bbb2ba7793dfeecf88f87cd510ced224f8a275f Mon Sep 17 00:00:00 2001
From: Alexander Markov <alexmarkov@google.com>
Date: Mon, 17 May 2021 09:57:25 -0700
Subject: [PATCH 1/3] Prepare to move --delete-tostring-package-uri option to
 Dart SDK

---
 flutter_frontend_server/lib/server.dart | 28 +++++++++++++++++--------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/flutter_frontend_server/lib/server.dart b/flutter_frontend_server/lib/server.dart
index d6a217fae3134..4b320479903a0 100644
--- a/flutter_frontend_server/lib/server.dart
+++ b/flutter_frontend_server/lib/server.dart
@@ -111,13 +111,18 @@ 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 '
+  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) {
@@ -126,7 +131,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) {
@@ -150,7 +156,9 @@ Future<int> starter(
         ]);
         compiler ??= _FlutterFrontendCompiler(
           output,
-          transformer: frontend.ToStringTransformer(null, deleteToStringPackageUris),
+          transformer: handleDeleteToString
+              ? frontend.ToStringTransformer(null, deleteToStringPackageUris)
+              : null,
         );
 
         await compiler.compile(input, options);
@@ -170,7 +178,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:

From cb6a4a5667b8827431ff4b8ce6ef0d44211d1a13 Mon Sep 17 00:00:00 2001
From: Alexander Markov <alexmarkov@google.com>
Date: Mon, 17 May 2021 13:01:35 -0700
Subject: [PATCH 2/3] Add TODO

---
 flutter_frontend_server/lib/server.dart | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/flutter_frontend_server/lib/server.dart b/flutter_frontend_server/lib/server.dart
index 4b320479903a0..2354f5b62e8c1 100644
--- a/flutter_frontend_server/lib/server.dart
+++ b/flutter_frontend_server/lib/server.dart
@@ -111,6 +111,8 @@ Future<int> starter(
   frontend.ProgramTransformer transformer,
 }) async {
   ArgResults options;
+  // TODO(https://github.com/dart-lang/sdk/issues/46022): Remove handling of
+  // --delete-tostring-package-uri option after it is added to Dart SDK.
   final bool handleDeleteToString =
       !frontend.argParser.options.containsKey('delete-tostring-package-uri');
   if (handleDeleteToString) {

From ba27af6502e865e1233ab9cd80277dd98249f2b9 Mon Sep 17 00:00:00 2001
From: Alexander Markov <alexmarkov@google.com>
Date: Mon, 17 May 2021 13:31:05 -0700
Subject: [PATCH 3/3] Format TODO

---
 flutter_frontend_server/lib/server.dart | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/flutter_frontend_server/lib/server.dart b/flutter_frontend_server/lib/server.dart
index 2354f5b62e8c1..47d454d8e908e 100644
--- a/flutter_frontend_server/lib/server.dart
+++ b/flutter_frontend_server/lib/server.dart
@@ -111,8 +111,9 @@ Future<int> starter(
   frontend.ProgramTransformer transformer,
 }) async {
   ArgResults options;
-  // TODO(https://github.com/dart-lang/sdk/issues/46022): Remove handling of
-  // --delete-tostring-package-uri option after it is added to Dart SDK.
+  // 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) {