fixed bug where bazel runs with curses when using the old sync view (#…

…7139) The old sync view does not use a pty based terminal and cannot handle bazel output correctly when it runs with curses.
bazelbuild · Dec 7, 2024 · 0fb3f81 · 0fb3f81
1 parent dc05380
commit 0fb3f81
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/base/src/com/google/idea/blaze/base/buildview/BazelExecService.kt b/base/src/com/google/idea/blaze/base/buildview/BazelExecService.kt
@@ -66,7 +66,12 @@ class BazelExecService(private val project: Project) : Disposable {
   }
 
   private suspend fun execute(ctx: BlazeContext, cmdBuilder: BlazeCommand.Builder): Int {
-    val cmd = cmdBuilder.apply { addBlazeFlags("--curses=yes") }.build()
+    // the old sync view does not use a PTY based terminal
+    if (BuildViewMigration.present(ctx)) {
+      cmdBuilder.addBlazeFlags("--curses=yes")
+    }
+
+    val cmd = cmdBuilder.build()
     val root = cmd.effectiveWorkspaceRoot.orElseGet { WorkspaceRoot.fromProject(project).path() }
     val size = BuildViewScope.of(ctx)?.consoleSize ?: PtyConsoleView.DEFAULT_SIZE
 
@@ -182,5 +187,4 @@ class BazelExecService(private val project: Project) : Disposable {
       }
     }
   }
-}
-
+}
diff --git a/base/src/com/google/idea/blaze/base/toolwindow/ConsoleView.java b/base/src/com/google/idea/blaze/base/toolwindow/ConsoleView.java
@@ -237,6 +237,10 @@ void println(PrintOutput output) {
   }
 
   private void println(String text, OutputType outputType) {
+    if (outputType == OutputType.PROCESS) {
+      text = text.stripTrailing();
+    }
+
     ansiEscapeDecoder.escapeText(
         text,
         outputType == OutputType.ERROR ? ProcessOutputTypes.STDERR : ProcessOutputTypes.STDOUT,