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

Execution helper now using the new onTimeout method and tries to collect process output

Browse Source 
Concern: shouldn't we shorten output from the process? From one side it may be huge, from other - we can loose some information
This commit is contained in:
Alexandr Evstigneev
2019-04-17 12:51:08 +03:00
parent 47171d3faa
commit eac25b70b8
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/execution/ExecutionHelper.java
+13 -4
View File
@@ -5,9 +5,7 @@ package com.intellij.execution;
import com.intellij.execution.configurations.GeneralCommandLine;
import com.intellij.execution.executors.DefaultRunExecutor;
import com.intellij.execution.impl.ExecutionManagerImpl;
import com.intellij.execution.process.OSProcessHandler;
import com.intellij.execution.process.ProcessHandler;
import com.intellij.execution.process.ProcessOutput;
import com.intellij.execution.process.*;
import com.intellij.execution.ui.RunContentDescriptor;
import com.intellij.execution.ui.RunContentManager;
import com.intellij.ide.errorTreeView.NewErrorTreeViewPanel;
@@ -23,6 +21,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.ui.popup.JBPopupFactory;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.wm.ToolWindow;
@@ -42,6 +41,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -419,6 +419,15 @@ public class ExecutionHelper {
private static Runnable createTimeLimitedExecutionProcess(@NotNull ProcessHandler processHandler,
@NotNull ExecutionMode mode,
@NotNull final String presentableCmdline) {
List<String> outputCollected = new ArrayList<>();
processHandler.addProcessListener(new ProcessAdapter() {
@Override
public void onTextAvailable(@NotNull ProcessEvent event, @NotNull Key outputType) {
if (StringUtil.isNotEmpty(event.getText())) {
outputCollected.add(outputType.toString() + ": " + event.getText());
}
}
});
return new Runnable() {
private final Semaphore mySemaphore = new Semaphore();
@@ -426,7 +435,7 @@ public class ExecutionHelper {
try {
final boolean finished = processHandler.waitFor(1000L * mode.getTimeout());
if (!finished) {
mode.getTimeoutCallback().consume(mode, presentableCmdline);
mode.onTimeout(processHandler, presentableCmdline, new ArrayList<>(outputCollected));
processHandler.destroyProcess();
}
}