1 files changed, 7 insertions, 2 deletions
diff --git a/platform/lang-api/src/com/intellij/execution/ExecutionTargetManager.java b/platform/lang-api/src/com/intellij/execution/ExecutionTargetManager.java
index b48a2e8919fb..612c9c1c80ea 100644
--- a/platform/lang-api/src/com/intellij/execution/ExecutionTargetManager.java
+++ b/platform/lang-api/src/com/intellij/execution/ExecutionTargetManager.java
@@ -15,6 +15,8 @@
  */
 package com.intellij.execution;
 
+import com.intellij.execution.runners.ExecutionEnvironment;
+import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.util.messages.Topic;
 import org.jetbrains.annotations.NotNull;
@@ -26,10 +28,9 @@ import java.util.List;
 public abstract class ExecutionTargetManager {
   public static final Topic<ExecutionTargetListener> TOPIC = Topic.create("ExecutionTarget topic", ExecutionTargetListener.class);
 
-
   @NotNull
   public static ExecutionTargetManager getInstance(@NotNull Project project) {
-    return project.getComponent(ExecutionTargetManager.class);
+    return ServiceManager.getService(project, ExecutionTargetManager.class);
   }
 
   @NotNull
@@ -57,6 +58,10 @@ public abstract class ExecutionTargetManager {
     return settings != null && target != null && settings.canRunOn(target) && target.canRun(settings);
   }
 
+  public static boolean canRun(@NotNull ExecutionEnvironment environment) {
+    return canRun(environment.getRunnerAndConfigurationSettings(), environment.getExecutionTarget());
+  }
+
   public static void update(@NotNull Project project) {
     getInstance(project).update();
   }