From d02f17535ac573a913466a482e7af4c0b52d873f Mon Sep 17 00:00:00 2001
From: Vladimir Lagunov <vladimir.lagunov@jetbrains.com>
Date: Fri, 8 May 2020 17:42:32 +0700
Subject: [PATCH] IDEA-CR-62441: Introduce asynchronous
 TargetedCommandLine.collectCommands.

(cherry picked from commit 5052289c97a80fed3f03f636aaef250fa2e42b84)

GitOrigin-RevId: 3ebbadc3999e577f9225923d12594783fdfd2754
---
 .../execution/target/TargetedCommandLine.java | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/platform/lang-api/src/com/intellij/execution/target/TargetedCommandLine.java b/platform/lang-api/src/com/intellij/execution/target/TargetedCommandLine.java
index 475450bfdb00..e83fcb6c82b5 100644
--- a/platform/lang-api/src/com/intellij/execution/target/TargetedCommandLine.java
+++ b/platform/lang-api/src/com/intellij/execution/target/TargetedCommandLine.java
@@ -10,12 +10,10 @@ import com.intellij.util.execution.ParametersListUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.concurrency.Promise;
+import org.jetbrains.concurrency.Promises;
 
 import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.TimeoutException;
 
 /**
@@ -65,20 +63,26 @@ public final class TargetedCommandLine {
   }
 
   public List<String> collectCommandsSynchronously() throws ExecutionException {
-    String command = resolvePromise(myExePath.getTargetValue(), "exe path");
-    if (command == null) {
-      throw new ExecutionException("Resolved value for exe path is null");
+    try {
+      return collectCommands().blockingGet(0);
     }
+    catch (java.util.concurrent.ExecutionException | TimeoutException e) {
+      throw new ExecutionException("Couldn't collect commands", e);
+    }
+  }
 
-    List<String> commandLine = new ArrayList<>(myParameters.size() + 1);
-
-    commandLine.add(command);
-
+  public @NotNull Promise<@NotNull List<@NotNull String>> collectCommands() {
+    List<Promise<String>> promises = new ArrayList<>(myParameters.size() + 1);
+    promises.add(myExePath.getTargetValue().then(command -> {
+      if (command == null) {
+        throw new IllegalStateException("Resolved value for exe path is null");
+      }
+      return command;
+    }));
     for (TargetValue<String> parameter : myParameters) {
-      commandLine.add(resolvePromise(parameter.getTargetValue(), "parameter"));
+      promises.add(parameter.getTargetValue());
     }
-
-    return commandLine;
+    return Promises.collectResults(promises);
   }
 
   @Nullable