Use ScopedBlazeProcessHandler when appropriate

(cherry picked from commit 930cd0c)
bazelbuild · Jul 5, 2023 · 72dc357 · 72dc357
1 parent bca5578
commit 72dc357
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/base/src/com/google/idea/blaze/base/command/BlazeCommandRunner.java b/base/src/com/google/idea/blaze/base/command/BlazeCommandRunner.java
@@ -73,9 +73,10 @@ InputStream runBlazeInfo(
       BuildResultHelper buildResultHelper,
       BlazeContext context)
       throws BuildException;
+
   /** Allows enabling the use of command runner for restricted set of users. */
-  default boolean shouldUseForLocalTests() {
-    return false;
+  default boolean canUseCli() {
+    return true;
   }
 
   /** Get a list of additional build flags. */

diff --git a/base/src/com/google/idea/blaze/base/command/BlazeCommandRunnerExperiments.java b/base/src/com/google/idea/blaze/base/command/BlazeCommandRunnerExperiments.java
@@ -25,9 +25,5 @@ public class BlazeCommandRunnerExperiments {
   public static final BoolExperiment USE_SINGLEJAR_FOR_DEBUGGING =
       new BoolExperiment("debug.localtests.singlejar.enable", true);
 
-  public static boolean isEnabledForTests(BlazeCommandRunner runner) {
-    return runner.shouldUseForLocalTests();
-  }
-
   private BlazeCommandRunnerExperiments() {}
 }
diff --git a/...m/google/idea/blaze/base/run/confighandler/BlazeCommandGenericRunConfigurationRunner.java b/...m/google/idea/blaze/base/run/confighandler/BlazeCommandGenericRunConfigurationRunner.java
@@ -27,7 +27,6 @@
 import com.google.idea.blaze.base.bazel.BuildSystem.BuildInvoker;
 import com.google.idea.blaze.base.command.BlazeCommand;
 import com.google.idea.blaze.base.command.BlazeCommandName;
-import com.google.idea.blaze.base.command.BlazeCommandRunnerExperiments;
 import com.google.idea.blaze.base.command.BlazeFlags;
 import com.google.idea.blaze.base.command.BlazeInvocationContext;
 import com.google.idea.blaze.base.command.buildresult.BuildResultHelper;
@@ -155,7 +154,9 @@ protected ProcessHandler startProcess() throws ExecutionException {
                 invoker,
                 ImmutableList.copyOf(buildResultHelper.getBuildFlags()),
                 context);
-
+        if (invoker.getCommandRunner().canUseCli()) {
+          return getScopedProcessHandler(project, blazeCommand.build(), workspaceRoot);
+        }
         return isTest()
             ? getProcessHandlerForTests(
                 project, invoker, buildResultHelper, blazeCommand, workspaceRoot, context)
@@ -255,7 +256,7 @@ private ProcessHandler getProcessHandlerForTests(
         BlazeContext context)
         throws ExecutionException {
       BlazeTestResultFinderStrategy testResultFinderStrategy =
-          BlazeCommandRunnerExperiments.isEnabledForTests(invoker.getCommandRunner())
+          !invoker.getCommandRunner().canUseCli()
               ? new BlazeTestResultHolder()
               : new LocalBuildEventProtocolTestFinderStrategy(buildResultHelper);
       BlazeTestUiSession testUiSession = null;
@@ -283,7 +284,7 @@ protected ConsoleView createConsole() {
         context.addOutputSink(PrintOutput.class, new WritingOutputSink(consoleView));
       }
       addConsoleFilters(consoleFilters.toArray(new Filter[0]));
-      return BlazeCommandRunnerExperiments.isEnabledForTests(invoker.getCommandRunner())
+      return !invoker.getCommandRunner().canUseCli()
           ? getCommandRunnerProcessHandler(
               project,
               invoker,

diff --git a/java/src/com/google/idea/blaze/java/run/BlazeJavaRunProfileState.java b/java/src/com/google/idea/blaze/java/run/BlazeJavaRunProfileState.java
@@ -108,7 +108,7 @@ protected ProcessHandler startProcess() throws ExecutionException {
                 getConfiguration().getTargetKind());
     BlazeTestUiSession testUiSession = null;
     if (TargetKindUtil.isLocalTest(getConfiguration().getTargetKind())
-        && invoker.getCommandRunner().shouldUseForLocalTests()
+        && !invoker.getCommandRunner().canUseCli()
         && getExecutorType().isDebugType()) {
       File downloadDir = getDownloadDir();
       WorkspaceRoot workspaceRoot =