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-91212 Launch does not wait for external tools to complete (external tool configured as 'Before launch' for the Run configuration)

Browse Source 
after-review improvements and fixes
This commit is contained in:
Vassiliy Kudryashov
2013-03-04 18:31:36 +04:00
parent 13a43e763a
commit 5970528c58
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/tools/Tool.java
+2 -5
View File
@@ -264,10 +264,6 @@ public class Tool implements SchemeElement {
return name.toString();
}
public void execute(AnActionEvent event, DataContext dataContext, long executionId) {
execute(event, dataContext, executionId, null);
}
/**
* @return <code>true</code> if task has been started successfully
*/
@@ -303,8 +299,9 @@ public class Tool implements SchemeElement {
}
OSProcessHandler handler = new OSProcessHandler(commandLine.createProcess(), commandLine.getCommandLineString());
handler.addProcessListener(new ToolProcessAdapter(project, synchronizeAfterExecution(), getName()));
if (processListener != null)
if (processListener != null) {
handler.addProcessListener(processListener);
}
handler.startNotify();
return true;
}
platform/lang-impl/src/com/intellij/tools/ToolBeforeRunTask.java
+5 -4
View File
@@ -22,6 +22,7 @@ import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.Ref;
import com.intellij.util.concurrency.Semaphore;
import org.jdom.Element;
import org.jetbrains.annotations.NonNls;
@@ -72,7 +73,7 @@ public class ToolBeforeRunTask extends BeforeRunTask<ToolBeforeRunTask> {
public boolean execute(final DataContext context, final long executionId) {
final Semaphore targetDone = new Semaphore();
final boolean[] result = new boolean[1];
final Ref<Boolean> result = new Ref<Boolean>(false);
try {
ApplicationManager.getApplication().invokeAndWait(new Runnable() {
@@ -82,12 +83,12 @@ public class ToolBeforeRunTask extends BeforeRunTask<ToolBeforeRunTask> {
boolean runToolResult = ToolAction.runTool(myToolActionId, context, null, executionId, new ProcessAdapter() {
@Override
public void processTerminated(ProcessEvent event) {
result[0] = event.getExitCode() == 0;
result.set(event.getExitCode() == 0);
targetDone.up();
}
});
if (!runToolResult) {
result[0] = false;
result.set(false);
targetDone.up();
}
}
@@ -98,7 +99,7 @@ public class ToolBeforeRunTask extends BeforeRunTask<ToolBeforeRunTask> {
return false;
}
targetDone.waitFor();
return result[0];
return result.get();
}
@Nullable