From ff9731d76a2ab0696fb003725f2f4796bdbd4d67 Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Wed, 8 Apr 2020 19:55:14 +0000
Subject: [PATCH] Switch migration to the isolate client.

Bug: https://github.com/dart-lang/sdk/issues/41056
Change-Id: I4a3fc8dfd6b3d99589b71fe6e42ff139ed408ed1
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/142901
Reviewed-by: Jaime Wren <jwren@google.com>
Commit-Queue: Janice Collins <jcollins@google.com>
---
 pkg/dartfix/lib/src/migrate/migrate.dart | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/pkg/dartfix/lib/src/migrate/migrate.dart b/pkg/dartfix/lib/src/migrate/migrate.dart
index eb8357e0bf0..a7cb7a422df 100644
--- a/pkg/dartfix/lib/src/migrate/migrate.dart
+++ b/pkg/dartfix/lib/src/migrate/migrate.dart
@@ -8,7 +8,7 @@ import 'dart:io';
 import 'package:analysis_server_client/handler/notification_handler.dart';
 import 'package:analysis_server_client/listener/server_listener.dart';
 import 'package:analysis_server_client/protocol.dart';
-import 'package:analysis_server_client/server.dart';
+import 'package:nnbd_migration/isolate_server.dart';
 import 'package:args/command_runner.dart';
 import 'package:cli_util/cli_logging.dart';
 import 'package:nnbd_migration/src/messages.dart';
@@ -88,18 +88,11 @@ class MigrateCommand extends Command {
 
     Map<String, List<AnalysisError>> fileErrors = {};
 
-    bool enableAsserts = false;
     String instrumentationLogFile;
-    bool profileServer = false;
-    String serverPath = options.serverPath;
-    int servicesPort;
     String sdkPath = options.sdkPath;
     bool stdioPassthrough = false;
 
     if (options.debug) {
-      enableAsserts = true;
-      profileServer = true;
-      servicesPort = 9500;
       stdioPassthrough = true;
       instrumentationLogFile = path.join(
           Directory.systemTemp.createTempSync('migration_debug').path,
@@ -116,11 +109,7 @@ class MigrateCommand extends Command {
       await server.start(
           clientId: 'dart $name',
           clientVersion: _dartSdkVersion,
-          enableAsserts: enableAsserts,
           instrumentationLogFile: instrumentationLogFile,
-          profileServer: profileServer,
-          serverPath: serverPath,
-          servicesPort: servicesPort,
           sdkPath: sdkPath);
       _ServerNotifications serverNotifications = _ServerNotifications(server);
       await serverNotifications.listenToServer(server);