MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-CR-62441: Introduce asynchronous TargetedCommandLine.collectCommands.

Browse Source 
(cherry picked from commit 5052289c97a80fed3f03f636aaef250fa2e42b84)

GitOrigin-RevId: 3ebbadc3999e577f9225923d12594783fdfd2754
This commit is contained in:
Vladimir Lagunov
2020-05-09 05:25:10 +00:00
committed by intellij-monorepo-bot
parent 4b44007e1f
commit d02f17535a
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-api/src/com/intellij/execution/target/TargetedCommandLine.java
+18 -14
View File
@@ -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