From 8fcc253f8e590916e7fa97772d533373460417f1 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Wed, 18 Dec 2019 10:42:33 +0100 Subject: [PATCH] =?UTF-8?q?simplify=20=E2=80=94=20compileAndRun=20doesn't?= =?UTF-8?q?=20use=20state?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GitOrigin-RevId: 0138a69f72d8a3f952666b21435da6dd402efdc1 --- .../lang-api/src/com/intellij/execution/ExecutionManager.java | 1 - .../src/com/intellij/execution/impl/ExecutionManagerImpl.java | 2 -- .../src/com/intellij/execution/impl/ExecutionManagerKtImpl.kt | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/platform/lang-api/src/com/intellij/execution/ExecutionManager.java b/platform/lang-api/src/com/intellij/execution/ExecutionManager.java index 287efe22dc41..8210c3567364 100644 --- a/platform/lang-api/src/com/intellij/execution/ExecutionManager.java +++ b/platform/lang-api/src/com/intellij/execution/ExecutionManager.java @@ -40,7 +40,6 @@ public abstract class ExecutionManager { */ public abstract void compileAndRun(@NotNull Runnable startRunnable, @NotNull ExecutionEnvironment environment, - @Nullable RunProfileState state, @Nullable Runnable onCancelRunnable); /** diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerImpl.java b/platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerImpl.java index 56b5ba940f68..0973ed86b1cd 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerImpl.java @@ -6,7 +6,6 @@ import com.intellij.execution.*; import com.intellij.execution.configuration.CompatibilityAwareRunProfile; import com.intellij.execution.configurations.RunConfiguration; import com.intellij.execution.configurations.RunProfile; -import com.intellij.execution.configurations.RunProfileState; import com.intellij.execution.executors.DefaultRunExecutor; import com.intellij.execution.process.ProcessHandler; import com.intellij.execution.runners.ExecutionEnvironment; @@ -262,7 +261,6 @@ public abstract class ExecutionManagerImpl extends ExecutionManager implements D @Override public void compileAndRun(@NotNull Runnable startRunnable, @NotNull ExecutionEnvironment environment, - @Nullable RunProfileState state, @Nullable Runnable onCancelRunnable) { long id = environment.getExecutionId(); if (id == 0) { diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerKtImpl.kt b/platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerKtImpl.kt index 3d8b963499ab..bf5e5a1b2332 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerKtImpl.kt +++ b/platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerKtImpl.kt @@ -119,7 +119,7 @@ class ExecutionManagerKtImpl(project: Project) : ExecutionManagerImpl(project) { else { compileAndRun(Runnable { ApplicationManager.getApplication().invokeLater(startRunnable, project.disposed) - }, environment, state, Runnable { + }, environment, Runnable { if (!project.isDisposed) { processNotStarted() }