Respect user settings for showing console windows on query sync

PiperOrigin-RevId: 588906081
bazelbuild · Dec 8, 2023 · c821b4d · c821b4d
1 parent d58c32b
commit c821b4d
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/base/src/com/google/idea/blaze/base/qsync/QuerySyncManager.java b/base/src/com/google/idea/blaze/base/qsync/QuerySyncManager.java
@@ -35,6 +35,7 @@
 import com.google.idea.blaze.base.scope.scopes.ProblemsViewScope;
 import com.google.idea.blaze.base.scope.scopes.ProgressIndicatorScope;
 import com.google.idea.blaze.base.scope.scopes.ToolWindowScope;
+import com.google.idea.blaze.base.settings.BlazeUserSettings;
 import com.google.idea.blaze.base.settings.BlazeUserSettings.FocusBehavior;
 import com.google.idea.blaze.base.sync.SyncMode;
 import com.google.idea.blaze.base.sync.SyncResult;
@@ -296,6 +297,7 @@ private ListenableFuture<Boolean> createAndSubmitRunTask(
       ThrowingScopedOperation operation,
       TaskOrigin taskOrigin) {
     querySyncActionStatsScope.getBuilder().setTaskOrigin(taskOrigin);
+    BlazeUserSettings userSettings = BlazeUserSettings.getInstance();
     return ProgressiveTaskWithProgressIndicator.builder(project, title)
         .submitTaskWithResult(
             indicator ->
@@ -311,7 +313,7 @@ private ListenableFuture<Boolean> createAndSubmitRunTask(
                                       ? showWindowOnAutomaticSyncErrors.getValue()
                                           ? FocusBehavior.ON_ERROR
                                           : FocusBehavior.NEVER
-                                      : FocusBehavior.ALWAYS)
+                                      : userSettings.getShowBlazeConsoleOnSync())
                               .setIssueParsers(
                                   BlazeIssueParser.defaultIssueParsers(
                                       project,
@@ -322,7 +324,9 @@ private ListenableFuture<Boolean> createAndSubmitRunTask(
                           .push(new ProgressIndicatorScope(indicator))
                           .push(scope)
                           .push(querySyncActionStatsScope)
-                          .push(new ProblemsViewScope(project, FocusBehavior.ALWAYS))
+                          .push(
+                              new ProblemsViewScope(
+                                  project, userSettings.getShowProblemsViewOnSync()))
                           .push(new IdeaLogScope());
                       try {
                         operation.execute(context);