Remove code for managing daemon startup of DevTools (flutter#8290)

This was for versions of Dart SDK < v2.15 which is very outdated

Author: helin24

flutter-idea/src/io/flutter/run/daemon/DaemonApi.java

@@ -81,10 +81,6 @@ CompletableFuture<Boolean> stopApp(@NotNull String appId) {
     return send("app.stop", new AppStop(appId));
   }
 
-  CompletableFuture<DevToolsAddress> devToolsServe() {
-    return send("devtools.serve", new DevToolsServe());
-  }
-
   CompletableFuture<Boolean> detachApp(@NotNull String appId) {
     return send("app.detach", new AppDetach(appId));
   }
@@ -491,32 +487,4 @@ List<String> parseResult(JsonElement result) {
       return platforms;
     }
   }
-
-  public static class DevToolsAddress {
-    public String host;
-    public int port;
-
-    public DevToolsAddress(String host, int port) {
-      this.host = host;
-      this.port = port;
-    }
-  }
-
-
-  private static class DevToolsServe extends Params<DevToolsAddress> {
-    @Override
-    DevToolsAddress parseResult(JsonElement result) {
-      if (!(result instanceof JsonObject)) {
-        return null;
-      }
-
-      final String host = ((JsonObject)result).get("host").getAsString();
-      final int port = ((JsonObject)result).get("port").getAsInt();
-      if (host.isEmpty() || port == 0) {
-        return null;
-      }
-
-      return new DevToolsAddress(host, port);
-    }
-  }
 }

flutter-idea/src/io/flutter/run/daemon/DevToolsServerTask.java

@@ -80,16 +80,6 @@ public void run(@NotNull ProgressIndicator progressIndicator) {
       progressIndicator.setFraction(30);
       progressIndicator.setText2("Init");
 
-      // If the `dart devtools` command is not supported, start the daemon instead.
-      final boolean dartDevToolsSupported = dartSdkSupportsDartDevTools();
-      if (!dartDevToolsSupported) {
-        LOG.info("Starting the DevTools daemon.");
-        progressIndicator.setFraction(60);
-        progressIndicator.setText2("Daemon set-up");
-        setUpWithDaemon();
-        return;
-      }
-
       // If we are in a Bazel workspace, start the server.
       // Note: This is only for internal usages.
       final WorkspaceCache workspaceCache = WorkspaceCache.getInstance(project);
@@ -128,16 +118,6 @@ public void run(@NotNull ProgressIndicator progressIndicator) {
     }
   }
 
-  private Boolean dartSdkSupportsDartDevTools() {
-    final DartSdk dartSdk = DartSdk.getDartSdk(project);
-    if (dartSdk != null) {
-      final Version version = Version.parseVersion(dartSdk.getVersion());
-      assert version != null;
-      return version.compareTo(2, 15, 0) >= 0;
-    }
-    return false;
-  }
-
   @Override
   public void onThrowable(@NotNull Throwable error) {
     cancelWithError(new Exception(error));
@@ -204,51 +184,6 @@ public void projectClosing(@NotNull Project project) {
     }
   }
 
-  private void setUpWithDaemon() {
-    try {
-      final GeneralCommandLine command = chooseCommand(project);
-      if (command == null) {
-        cancelWithError("Unable to find daemon command for project");
-        return;
-      }
-      this.process = new MostlySilentColoredProcessHandler(command);
-      daemonApi = new DaemonApi(process);
-      daemonApi.listen(process, new DevToolsService.DevToolsServiceListener());
-      daemonApi.devToolsServe().thenAccept((DaemonApi.DevToolsAddress address) -> {
-        if (!project.isOpen()) {
-          // We should skip starting DevTools (and doing any UI work) if the project has been closed.
-          return;
-        }
-        if (address == null) {
-          cancelWithError("DevTools address was null");
-        }
-        else {
-          devToolsFutureRef.get().complete(new DevToolsInstance(address.host, address.port));
-        }
-      });
-    }
-    catch (ExecutionException e) {
-      cancelWithError(e);
-    }
-
-    ProjectManager.getInstance().addProjectManagerListener(project, new ProjectManagerListener() {
-      @Override
-      public void projectClosing(@NotNull Project project) {
-        devToolsFutureRef.set(null);
-
-        try {
-          daemonApi.daemonShutdown().get(5, TimeUnit.SECONDS);
-        }
-        catch (InterruptedException | java.util.concurrent.ExecutionException | TimeoutException e) {
-          LOG.error("DevTools daemon did not shut down normally: " + e);
-          if (!process.isProcessTerminated()) {
-            process.destroyProcess();
-          }
-        }
-      }
-    });
-  }
-
   private CompletableFuture<DevToolsInstance> checkForDartPluginInitiatedDevToolsWithRetries(@NotNull ProgressIndicator progressIndicator)
     throws InterruptedException {
     progressIndicator.setText2("Waiting for server with DTD");
@@ -319,32 +254,6 @@ private void tryParseStartupText(@NotNull String text) {
     }
   }
 
-  private static GeneralCommandLine chooseCommand(@NotNull final Project project) {
-    // Use daemon script if this is a bazel project.
-    final Workspace workspace = WorkspaceCache.getInstance(project).get();
-    if (workspace != null) {
-      final String script = workspace.getDaemonScript();
-      if (script != null) {
-        return createCommand(workspace.getRoot().getPath(), script, ImmutableList.of());
-      }
-    }
-
-    // Otherwise, use the Flutter SDK.
-    final FlutterSdk sdk = FlutterSdk.getFlutterSdk(project);
-    if (sdk == null) {
-      return null;
-    }
-
-    try {
-      final String path = FlutterSdkUtil.pathToFlutterTool(sdk.getHomePath());
-      return createCommand(sdk.getHomePath(), path, ImmutableList.of("daemon"));
-    }
-    catch (ExecutionException e) {
-      FlutterUtils.warn(LOG, "Unable to calculate command to start Flutter daemon", e);
-      return null;
-    }
-  }
-
   private static @NotNull GeneralCommandLine createCommand(String workDir, String command, List<String> arguments) {
     final GeneralCommandLine result = new GeneralCommandLine().withWorkDirectory(workDir);
     result.setCharset(StandardCharsets.UTF_8);

flutter-idea/src/io/flutter/run/daemon/FlutterApp.java

@@ -405,10 +405,6 @@ public CompletableFuture<DaemonApi.RestartResult> performHotReload(boolean pause
     return future;
   }
 
-  public CompletableFuture<DaemonApi.DevToolsAddress> serveDevTools() {
-    return myDaemonApi.devToolsServe();
-  }
-
   public CompletableFuture<JsonObject> callServiceExtension(String methodName) {
     return callServiceExtension(methodName, new HashMap<>());
   }