From 32a416cbe11760fdfb17c42a4ee1c2cf8356e39f Mon Sep 17 00:00:00 2001
From: Daniel Brauner <daniel.brauner@jetbrains.com>
Date: Thu, 12 Sep 2024 15:33:16 +0200
Subject: [PATCH 01/17] removed unused consumed bytes from build event stream

---
 .../buildresult/BuildEventStreamProvider.java |  7 ---
 .../command/buildresult/ParsedBepOutput.java  |  9 ----
 .../logging/utils/BuildPhaseSyncStats.java    |  5 --
 .../utils/querysync/BuildDepsStats.java       |  4 --
 .../base/qsync/BazelDependencyBuilder.java    |  1 -
 .../blaze/base/sync/BuildPhaseSyncTask.java   | 48 +++++++++----------
 .../base/sync/aspects/BlazeBuildOutputs.java  | 11 +----
 7 files changed, 25 insertions(+), 60 deletions(-)

diff --git a/base/src/com/google/idea/blaze/base/command/buildresult/BuildEventStreamProvider.java b/base/src/com/google/idea/blaze/base/command/buildresult/BuildEventStreamProvider.java
index 8cc55a8633c..6229c3b1ebb 100644
--- a/base/src/com/google/idea/blaze/base/command/buildresult/BuildEventStreamProvider.java
+++ b/base/src/com/google/idea/blaze/base/command/buildresult/BuildEventStreamProvider.java
@@ -55,17 +55,10 @@ static BuildEventStreamProvider fromInputStream(InputStream stream) {
       public BuildEvent getNext() throws BuildEventStreamException {
         return parseNextEventFromStream(countingStream);
       }
-
-      @Override
-      public long getBytesConsumed() {
-        return countingStream.getCount();
-      }
     };
   }
 
   /** Returns the next build event in the stream, or null if there are none remaining. */
   @Nullable
   BuildEventStreamProtos.BuildEvent getNext() throws BuildEventStreamException;
-
-  long getBytesConsumed();
 }
diff --git a/base/src/com/google/idea/blaze/base/command/buildresult/ParsedBepOutput.java b/base/src/com/google/idea/blaze/base/command/buildresult/ParsedBepOutput.java
index 8919bfcf609..7027fb608d7 100644
--- a/base/src/com/google/idea/blaze/base/command/buildresult/ParsedBepOutput.java
+++ b/base/src/com/google/idea/blaze/base/command/buildresult/ParsedBepOutput.java
@@ -71,7 +71,6 @@ public final class ParsedBepOutput {
           ImmutableSetMultimap.of(),
           0,
           BuildResult.SUCCESS,
-          0,
           ImmutableSet.of());
 
   private static final String WORKSPACE_ITEM_KEY_SOURCE_URI = "SOURCE_URI";
@@ -200,7 +199,6 @@ public static ParsedBepOutput parseBepArtifacts(
         targetToFileSets.build(),
         startTimeMillis,
         buildResult,
-        stream.getBytesConsumed(),
         targetsWithErrors.build());
   }
 
@@ -260,7 +258,6 @@ private static ImmutableMap<String, FileSet> fillInTransitiveFileSetData(
   final long syncStartTimeMillis;
 
   private final BuildResult buildResult;
-  private final long bepBytesConsumed;
   private final ImmutableSet<Label> targetsWithErrors;
 
   private ParsedBepOutput(
@@ -271,7 +268,6 @@ private ParsedBepOutput(
       ImmutableSetMultimap<String, String> targetFileSets,
       long syncStartTimeMillis,
       BuildResult buildResult,
-      long bepBytesConsumed,
       ImmutableSet<Label> targetsWithErrors) {
     this.buildId = buildId;
     this.localExecRoot = localExecRoot;
@@ -280,7 +276,6 @@ private ParsedBepOutput(
     this.targetFileSets = targetFileSets;
     this.syncStartTimeMillis = syncStartTimeMillis;
     this.buildResult = buildResult;
-    this.bepBytesConsumed = bepBytesConsumed;
     this.targetsWithErrors = targetsWithErrors;
   }
 
@@ -304,10 +299,6 @@ public BuildResult getBuildResult() {
     return buildResult;
   }
 
-  public long getBepBytesConsumed() {
-    return bepBytesConsumed;
-  }
-
   /** Returns all output artifacts of the build. */
   public ImmutableSet<OutputArtifact> getAllOutputArtifacts(Predicate<String> pathFilter) {
     return fileSets.values().stream()
diff --git a/base/src/com/google/idea/blaze/base/logging/utils/BuildPhaseSyncStats.java b/base/src/com/google/idea/blaze/base/logging/utils/BuildPhaseSyncStats.java
index 292cdcf4021..8b2fc7be2ab 100644
--- a/base/src/com/google/idea/blaze/base/logging/utils/BuildPhaseSyncStats.java
+++ b/base/src/com/google/idea/blaze/base/logging/utils/BuildPhaseSyncStats.java
@@ -50,8 +50,6 @@ public abstract class BuildPhaseSyncStats {
 
   public abstract Duration totalTime();
 
-  public abstract long bepBytesConsumed();
-
   public abstract Optional<ShardStats> shardStats();
 
   public abstract Optional<BuildBinaryType> buildBinaryType();
@@ -66,7 +64,6 @@ public static Builder builder() {
         .setTargetsDerivedFromDirectories(false)
         .setBuildResult(BuildResult.FATAL_ERROR)
         .setTimedEvents(ImmutableList.of())
-        .setBepBytesConsumed(0L)
         .setBuildIds(ImmutableList.of())
         .setTotalTime(Duration.ZERO);
   }
@@ -93,8 +90,6 @@ public abstract static class Builder {
 
     public abstract Builder setTotalTime(Duration totalTime);
 
-    public abstract Builder setBepBytesConsumed(long bytes);
-
     public abstract Builder setShardStats(ShardStats shardStats);
 
     public abstract Builder setBuildBinaryType(BuildBinaryType type);
diff --git a/base/src/com/google/idea/blaze/base/logging/utils/querysync/BuildDepsStats.java b/base/src/com/google/idea/blaze/base/logging/utils/querysync/BuildDepsStats.java
index ba26d927b05..adc20b1d535 100644
--- a/base/src/com/google/idea/blaze/base/logging/utils/querysync/BuildDepsStats.java
+++ b/base/src/com/google/idea/blaze/base/logging/utils/querysync/BuildDepsStats.java
@@ -51,8 +51,6 @@ public abstract class BuildDepsStats implements QuerySyncOperationStats {
 
   public abstract Optional<Integer> updatedFilesCount();
 
-  public abstract Optional<Long> bepByteConsumed();
-
   public abstract Optional<Long> artifactBytesConsumed();
 
   @Override
@@ -94,8 +92,6 @@ public final Builder setBuildTargets(Iterable<Label> value) {
 
     public abstract Builder setUpdatedFilesCount(@Nullable Integer value);
 
-    public abstract Builder setBepByteConsumed(@Nullable Long value);
-
     public abstract Builder setArtifactBytesConsumed(@Nullable Long value);
 
     public abstract Builder setTotalClockTime(@Nullable Duration value);
diff --git a/base/src/com/google/idea/blaze/base/qsync/BazelDependencyBuilder.java b/base/src/com/google/idea/blaze/base/qsync/BazelDependencyBuilder.java
index e89dcc4b595..49958d1ee07 100644
--- a/base/src/com/google/idea/blaze/base/qsync/BazelDependencyBuilder.java
+++ b/base/src/com/google/idea/blaze/base/qsync/BazelDependencyBuilder.java
@@ -212,7 +212,6 @@ public OutputInfo build(
       buildDepsStatsBuilder.ifPresent(
           stats -> {
             stats.setBuildIds(outputs.getBuildIds());
-            stats.setBepByteConsumed(outputs.bepBytesConsumed);
           });
 
       BazelExitCodeException.throwIfFailed(
diff --git a/base/src/com/google/idea/blaze/base/sync/BuildPhaseSyncTask.java b/base/src/com/google/idea/blaze/base/sync/BuildPhaseSyncTask.java
index 9faca27c974..1eac00b906f 100644
--- a/base/src/com/google/idea/blaze/base/sync/BuildPhaseSyncTask.java
+++ b/base/src/com/google/idea/blaze/base/sync/BuildPhaseSyncTask.java
@@ -16,7 +16,6 @@
 package com.google.idea.blaze.base.sync;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.idea.blaze.base.issueparser.BlazeIssueParser.targetDetectionQueryParsers;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
@@ -262,8 +261,7 @@ private void doRun(BlazeContext context) throws SyncFailedException, SyncCancele
     buildStats
         .setBuildResult(blazeBuildResult.buildResult)
         .setBuildIds(blazeBuildResult.getBuildIds())
-        .setBuildBinaryType(syncBuildInvoker.getType())
-        .setBepBytesConsumed(blazeBuildResult.bepBytesConsumed);
+        .setBuildBinaryType(syncBuildInvoker.getType());
 
     if (context.isCancelled()) {
       throw new SyncCanceledException();
@@ -385,28 +383,28 @@ private ImmutableList<TargetExpression> findTargetsBuildingSourceFiles(
     }
     String title = "Query targets building source files";
     List<TargetInfo> result =
-        ProgressiveTaskWithProgressIndicator.builder(project, title).submitTaskWithResult(
-            indicator -> Scope.push(
-                context,
-                childContext -> {
-                  childContext.push(new TimingScope("QuerySourceTargets", EventType.BlazeInvocation));
-                  childContext.output(new StatusOutput("Querying targets building source files..."));
-                  var scope = childContext.getScope(ToolWindowScope.class);
-                  if(scope != null) { // If ToolWindowScope doesn't already exist, it means the output is not supposed to be printed to toolwindow (for example in tests)
-                    var task = new Task(project, title, Task.Type.SYNC, scope.getTask());
-                    var newScope = new ToolWindowScope.Builder(project, task)
-                        .setProgressIndicator(indicator)
-                        .setPopupBehavior(BlazeUserSettings.FocusBehavior.ON_ERROR)
-                        .setIssueParsers(targetDetectionQueryParsers(project, WorkspaceRoot.fromProject(project)))
-                        .build();
-                    childContext.push(newScope);
-                  }
-
-                  // We don't want blaze build errors to fail the whole sync
-                  childContext.setPropagatesErrors(false);
-                  return BlazeQuerySourceToTargetProvider.getTargetsBuildingSourceFiles(
-                      project, pathsToQuery.build(), childContext, ContextType.Sync);
-                })).get(); // We still call no-timeout waitFor in ExternalTask.run()
+        ProgressiveTaskWithProgressIndicator.builder(project, title)
+            .submitTaskWithResult(
+                indicator -> Scope.push(
+                    context,
+                    childContext -> {
+                      childContext.push(new TimingScope("QuerySourceTargets", EventType.BlazeInvocation));
+                      childContext.output(new StatusOutput("Querying targets building source files..."));
+                      var scope = childContext.getScope(ToolWindowScope.class);
+                      if(scope != null) { // If ToolWindowScope doesn't already exist, it means the output is not supposed to be printed to toolwindow (for example in tests)
+                        var task = new Task(project, title, Task.Type.SYNC, scope.getTask());
+                        var newScope = new ToolWindowScope.Builder(project, task)
+                            .setProgressIndicator(indicator)
+                            .setPopupBehavior(BlazeUserSettings.FocusBehavior.ON_ERROR)
+                            .build();
+                        childContext.push(newScope);
+                      }
+
+                      // We don't want blaze build errors to fail the whole sync
+                      childContext.setPropagatesErrors(false);
+                      return BlazeQuerySourceToTargetProvider.getTargetsBuildingSourceFiles(
+                          project, pathsToQuery.build(), childContext, ContextType.Sync);
+                    })).get(); // We still call no-timeout waitFor in ExternalTask.run()
     if (context.isCancelled()) {
       throw new SyncCanceledException();
     }
diff --git a/base/src/com/google/idea/blaze/base/sync/aspects/BlazeBuildOutputs.java b/base/src/com/google/idea/blaze/base/sync/aspects/BlazeBuildOutputs.java
index 7cbf31eec79..59c7274e2cd 100644
--- a/base/src/com/google/idea/blaze/base/sync/aspects/BlazeBuildOutputs.java
+++ b/base/src/com/google/idea/blaze/base/sync/aspects/BlazeBuildOutputs.java
@@ -41,7 +41,7 @@ public class BlazeBuildOutputs {
 
   public static BlazeBuildOutputs noOutputs(BuildResult buildResult) {
     return new BlazeBuildOutputs(
-        buildResult, ImmutableMap.of(), ImmutableMap.of(), ImmutableSet.of(), 0L, Optional.empty());
+        buildResult, ImmutableMap.of(), ImmutableMap.of(), ImmutableSet.of(), Optional.empty());
   }
 
   @VisibleForTesting
@@ -51,7 +51,6 @@ public static BlazeBuildOutputs noOutputs(String buildId, BuildResult buildResul
         ImmutableMap.of(),
         ImmutableMap.of(buildId, buildResult),
         ImmutableSet.of(),
-        0L,
         Optional.empty());
   }
 
@@ -68,7 +67,6 @@ public static BlazeBuildOutputs fromParsedBepOutput(
             : parsedOutput.getFullArtifactData(),
         buildIdWithResult,
         parsedOutput.getTargetsWithErrors(),
-        parsedOutput.getBepBytesConsumed(),
         parsedOutput.getSourceUri());
   }
 
@@ -76,7 +74,6 @@ public static BlazeBuildOutputs fromParsedBepOutput(
   // Maps build id to the build result of individual shards
   private final ImmutableMap<String, BuildResult> buildShardResults;
   private final ImmutableSet<Label> targetsWithErrors;
-  public final long bepBytesConsumed;
 
   public final Optional<String> sourceUri;
 
@@ -94,13 +91,11 @@ private BlazeBuildOutputs(
       Map<String, BepArtifactData> artifacts,
       ImmutableMap<String, BuildResult> buildShardResults,
       ImmutableSet<Label> targetsWithErrors,
-      long bepBytesConsumed,
       Optional<String> sourceUri) {
     this.buildResult = buildResult;
     this.artifacts = ImmutableMap.copyOf(artifacts);
     this.buildShardResults = buildShardResults;
     this.targetsWithErrors = targetsWithErrors;
-    this.bepBytesConsumed = bepBytesConsumed;
     this.sourceUri = sourceUri;
 
     ImmutableSetMultimap.Builder<String, OutputArtifact> perTarget = ImmutableSetMultimap.builder();
@@ -171,9 +166,7 @@ public BlazeBuildOutputs updateOutputs(BlazeBuildOutputs nextOutputs) {
             .collect(
                 // On duplicate buildIds, preserve most recent result
                 toImmutableMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1)),
-        Sets.union(targetsWithErrors, nextOutputs.targetsWithErrors).immutableCopy(),
-        bepBytesConsumed + nextOutputs.bepBytesConsumed,
-        sourceUri);
+        Sets.union(targetsWithErrors, nextOutputs.targetsWithErrors).immutableCopy(), sourceUri);
   }
 
   public ImmutableList<String> getBuildIds() {

From 4f059e6c93d0f1fa5684396735ec9ce4fc1179c8 Mon Sep 17 00:00:00 2001
From: Daniel Brauner <daniel.brauner@jetbrains.com>
Date: Thu, 12 Sep 2024 15:41:33 +0200
Subject: [PATCH 02/17] Rename .java to .kt

---
 .../blaze/base/scope/output/{IssueOutput.java => IssueOutput.kt}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename base/src/com/google/idea/blaze/base/scope/output/{IssueOutput.java => IssueOutput.kt} (100%)

diff --git a/base/src/com/google/idea/blaze/base/scope/output/IssueOutput.java b/base/src/com/google/idea/blaze/base/scope/output/IssueOutput.kt
similarity index 100%
rename from base/src/com/google/idea/blaze/base/scope/output/IssueOutput.java
rename to base/src/com/google/idea/blaze/base/scope/output/IssueOutput.kt

From 5f1d0aec1e622518470dc0e105da6e113c0b966a Mon Sep 17 00:00:00 2001
From: Daniel Brauner <daniel.brauner@jetbrains.com>
Date: Thu, 12 Sep 2024 15:41:33 +0200
Subject: [PATCH 03/17] refactor for IssueOutput to extend BuildIssue

# Conflicts:
#	base/src/com/google/idea/blaze/base/wizard2/ui/BlazeEditProjectViewControl.java
---
 .bazelrc                                      |   1 +
 aswb/aswb.bazelproject                        |   4 +
 .../sync/BlazeNdkDependencySyncPlugin.java    |   2 +-
 .../BlazeAndroidWorkspaceImporter.java        |   4 +-
 .../sync/importer/BlazeImportUtil.java        |   4 +-
 .../problems/GeneratedResourceWarnings.java   |  11 +-
 .../sync/sdk/AndroidSdkFromProjectView.java   |   6 +-
 base/BUILD                                    |   7 +-
 .../base/issueparser/BlazeIssueParser.java    |  60 ++---
 .../issueparser/IssueOutputLineProcessor.java |   3 +-
 .../ToolWindowTaskIssueOutputFilter.java      |  21 +-
 .../base/projectview/ProjectViewVerifier.java |   8 +-
 .../base/projectview/parser/ParseContext.java |   4 +-
 .../blaze/base/scope/output/IssueOutput.kt    | 230 +++++++-----------
 .../blaze/base/sync/SyncPhaseCoordinator.java |  21 +-
 .../aspects/BlazeIdeInterfaceAspectsImpl.java |   2 +-
 .../base/ui/problems/BlazeProblemsView.java   |  33 +--
 .../ui/problems/BuildTasksProblemsView.java   |  41 ++--
 .../ui/BlazeEditProjectViewControl.java       |   6 +-
 clwb/clwb.bazelproject                        |   1 +
 .../idea/blaze/cpp/BlazeCWorkspace.java       |   2 +-
 .../BlazeConfigurationToolchainResolver.java  |   2 +-
 .../idea/blaze/dart/BlazeDartSyncPlugin.java  |   2 +-
 .../blaze/gazelle/GazelleIssueParsers.java    |   7 +-
 .../sync/AlwaysPresentGoSyncPlugin.java       |   6 +-
 ijwb/ijwb.bazelproject                        |   3 +
 .../FastBuildCompilerFactoryImpl.java         |  19 +-
 .../sync/source/JavaSourcePackageReader.java  |   2 +-
 .../javascript/BlazeJavascriptSyncPlugin.java |   2 +-
 .../typescript/BlazeTypescriptSyncPlugin.java |   4 +-
 .../sync/AlwaysPresentKotlinSyncPlugin.java   |   2 +-
 .../issueparser/PyIssueParserProvider.java    |  10 +-
 .../sync/AlwaysPresentPythonSyncPlugin.java   |   2 +-
 .../python/sync/BlazePythonSyncPlugin.java    |   2 +-
 .../sync/AlwaysPresentScalaSyncPlugin.java    |   2 +-
 35 files changed, 198 insertions(+), 338 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index d8f1bc891d8..2c602b177ce 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -1,4 +1,5 @@
 build --java_language_version=17 --java_runtime_version=17
+build --tool_java_language_version=17 --tool_java_runtime_version=17
 
 # Delete test data packages, needed for bazel integration tests. Update by running the following command:
 # bazel run @rules_bazel_integration_test//tools:update_deleted_packages
diff --git a/aswb/aswb.bazelproject b/aswb/aswb.bazelproject
index 96d6a6a7271..015b3e045d8 100644
--- a/aswb/aswb.bazelproject
+++ b/aswb/aswb.bazelproject
@@ -22,3 +22,7 @@ test_sources:
   */testcompat/unittests*
   */testcompat/integrationtests*
   */testcompat/utils/integration*
+
+additional_languages:
+  kotlin
+
diff --git a/aswb/src/com/google/idea/blaze/android/sync/BlazeNdkDependencySyncPlugin.java b/aswb/src/com/google/idea/blaze/android/sync/BlazeNdkDependencySyncPlugin.java
index e945650f37d..8e323a36657 100644
--- a/aswb/src/com/google/idea/blaze/android/sync/BlazeNdkDependencySyncPlugin.java
+++ b/aswb/src/com/google/idea/blaze/android/sync/BlazeNdkDependencySyncPlugin.java
@@ -80,7 +80,7 @@ private static void notifyMissingPlugin(BlazeContext context, PluginNameAndId pl
                 + "Click here to install/enable it, then restart the IDE",
             plugin.name);
     IssueOutput.error(msg)
-        .navigatable(PluginUtils.installOrEnablePluginNavigable(plugin.id))
+        .withNavigatable(PluginUtils.installOrEnablePluginNavigable(plugin.id))
         .submit(context);
   }
 }
diff --git a/aswb/src/com/google/idea/blaze/android/sync/importer/BlazeAndroidWorkspaceImporter.java b/aswb/src/com/google/idea/blaze/android/sync/importer/BlazeAndroidWorkspaceImporter.java
index 62a41bf8ba5..999a810506e 100644
--- a/aswb/src/com/google/idea/blaze/android/sync/importer/BlazeAndroidWorkspaceImporter.java
+++ b/aswb/src/com/google/idea/blaze/android/sync/importer/BlazeAndroidWorkspaceImporter.java
@@ -41,10 +41,10 @@
 import com.google.idea.blaze.base.model.primitives.Label;
 import com.google.idea.blaze.base.scope.BlazeContext;
 import com.google.idea.blaze.base.scope.output.IssueOutput;
-import com.google.idea.blaze.base.scope.output.IssueOutput.Category;
 import com.google.idea.blaze.base.scope.output.PerformanceWarning;
 import com.google.idea.blaze.common.Output;
 import com.google.idea.common.experiments.BoolExperiment;
+import com.intellij.build.events.MessageEvent.Kind;
 import com.intellij.openapi.project.Project;
 import java.util.Collection;
 import java.util.Collections;
@@ -327,7 +327,7 @@ private ImmutableList<AndroidResourceModule> buildAndroidResourceModules(
         if (mergeResourcesEnabled.getValue()) {
           messageBuilder.append("  ").append("Merging Resources...").append("\n");
           String message = messageBuilder.toString();
-          context.accept(IssueOutput.issue(Category.INFORMATION, message).build());
+          context.accept(IssueOutput.issue(Kind.INFO, message).build());
 
           result.add(mergeAndroidResourceModules(androidResourceModulesWithJavaPackage));
         } else {
diff --git a/aswb/src/com/google/idea/blaze/android/sync/importer/BlazeImportUtil.java b/aswb/src/com/google/idea/blaze/android/sync/importer/BlazeImportUtil.java
index 1b2ab3540f9..8e806f54bd2 100644
--- a/aswb/src/com/google/idea/blaze/android/sync/importer/BlazeImportUtil.java
+++ b/aswb/src/com/google/idea/blaze/android/sync/importer/BlazeImportUtil.java
@@ -39,6 +39,7 @@
 import com.google.idea.blaze.base.sync.projectview.ProjectViewTargetImportFilter;
 import com.google.idea.blaze.common.Output;
 import com.google.idea.blaze.java.sync.model.BlazeJarLibrary;
+import com.intellij.build.events.MessageEvent.Kind;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.text.StringUtil;
 import java.util.Collection;
@@ -110,8 +111,7 @@ static Consumer<Output> asConsumer(BlazeContext context) {
       context.output(issue);
       if (issue instanceof IssueOutput) {
         IssueOutput issueOutput = (IssueOutput) issue;
-        if (issueOutput.getCategory()
-            == com.google.idea.blaze.base.scope.output.IssueOutput.Category.ERROR) {
+        if (issueOutput.getKind() == Kind.ERROR) {
           context.setHasError();
         }
       }
diff --git a/aswb/src/com/google/idea/blaze/android/sync/importer/problems/GeneratedResourceWarnings.java b/aswb/src/com/google/idea/blaze/android/sync/importer/problems/GeneratedResourceWarnings.java
index 81641227959..7edd9de643c 100644
--- a/aswb/src/com/google/idea/blaze/android/sync/importer/problems/GeneratedResourceWarnings.java
+++ b/aswb/src/com/google/idea/blaze/android/sync/importer/problems/GeneratedResourceWarnings.java
@@ -71,9 +71,7 @@ public static void submit(
                             + "Double-click to add to project view if needed to resolve"
                             + " references.",
                         interestingDirectories.size()))
-                .inFile(projectViewFile)
-                .onLine(1)
-                .inColumn(1)
+                .withFile(projectViewFile)
                 .build());
         for (Map.Entry<ArtifactLocation, Integer> entry : interestingDirectories.entrySet()) {
           context.accept(
@@ -81,10 +79,7 @@ public static void submit(
                       String.format(
                           "Dropping generated resource directory '%s' w/ %d subdirs",
                           entry.getKey(), entry.getValue()))
-                  .inFile(projectViewFile)
-                  .navigatable(
-                      new AddGeneratedResourceDirectoryNavigatable(
-                          project, projectViewFile, entry.getKey()))
+                  .withFile(projectViewFile)
                   .build());
         }
       }
@@ -98,7 +93,7 @@ public static void submit(
                       unusedAllowlistEntries.size(),
                       GeneratedAndroidResourcesSection.KEY.getName(),
                       String.join("\n  ", unusedAllowlistEntries)))
-              .inFile(projectViewFile)
+              .withFile(projectViewFile)
               .build());
     }
   }
diff --git a/aswb/src/com/google/idea/blaze/android/sync/sdk/AndroidSdkFromProjectView.java b/aswb/src/com/google/idea/blaze/android/sync/sdk/AndroidSdkFromProjectView.java
index 7301a0080ab..9445ccc47c1 100644
--- a/aswb/src/com/google/idea/blaze/android/sync/sdk/AndroidSdkFromProjectView.java
+++ b/aswb/src/com/google/idea/blaze/android/sync/sdk/AndroidSdkFromProjectView.java
@@ -51,7 +51,7 @@ public static AndroidSdkPlatform getAndroidSdkPlatform(
     if (sdks.isEmpty()) {
       String msg = "No Android SDK configured. Please use the SDK manager to configure.";
       IssueOutput.error(msg)
-          .navigatable(
+          .withNavigatable(
               new Navigatable() {
                 @Override
                 public void navigate(boolean b) {
@@ -87,7 +87,7 @@ public boolean canNavigateToSource() {
               + getAvailableTargetHashesAsList(sdks)
               + ". To install more android SDKs, use the SDK manager.";
       IssueOutput.error(msg)
-          .inFile(projectViewFile != null ? projectViewFile.projectViewFile : null)
+          .withFile(projectViewFile != null ? projectViewFile.projectViewFile : null)
           .submit(context);
       BlazeSyncManager.printAndLogError(msg, context);
       return null;
@@ -98,7 +98,7 @@ public boolean canNavigateToSource() {
       ProjectViewFile projectViewFile = projectViewSet.getTopLevelProjectViewFile();
       String msg = String.format(NO_SDK_ERROR_TEMPLATE, androidSdk, getAllAvailableTargetHashes());
       IssueOutput.error(msg)
-          .inFile(projectViewFile != null ? projectViewFile.projectViewFile : null)
+          .withFile(projectViewFile != null ? projectViewFile.projectViewFile : null)
           .submit(context);
       BlazeSyncManager.printAndLogError(msg, context);
       return null;
diff --git a/base/BUILD b/base/BUILD
index a2a8d393c37..b06581ceec8 100644
--- a/base/BUILD
+++ b/base/BUILD
@@ -17,12 +17,13 @@ load(
     "intellij_integration_test_suite",
     "intellij_unit_test_suite",
 )
+load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
 
-java_library(
+kt_jvm_library(
     name = "base",
-    srcs = glob(["src/**/*.java"]),
-    javacopts = ["-Xep:FutureReturnValueIgnored:OFF"],
+    srcs = glob(["src/**/*.java", "src/**/*.kt"]),
     resources = glob(["src/resources/**/*"]),
+    resource_strip_prefix = "base/src",
     visibility = PLUGIN_PACKAGES_VISIBILITY,
     deps = [
         "//common/actions",
diff --git a/base/src/com/google/idea/blaze/base/issueparser/BlazeIssueParser.java b/base/src/com/google/idea/blaze/base/issueparser/BlazeIssueParser.java
index 66adb598827..cc8c17456b9 100644
--- a/base/src/com/google/idea/blaze/base/issueparser/BlazeIssueParser.java
+++ b/base/src/com/google/idea/blaze/base/issueparser/BlazeIssueParser.java
@@ -16,9 +16,6 @@
 package com.google.idea.blaze.base.issueparser;
 
 import static com.google.common.base.Preconditions.checkState;
-import static com.google.idea.blaze.base.scope.output.IssueOutput.Category.ERROR;
-import static com.google.idea.blaze.base.scope.output.IssueOutput.Category.NOTE;
-import static com.google.idea.blaze.base.scope.output.IssueOutput.Category.WARNING;
 
 import com.google.common.base.Ascii;
 import com.google.common.collect.ImmutableList;
@@ -35,6 +32,7 @@
 import com.google.idea.blaze.base.projectview.section.sections.TargetSection;
 import com.google.idea.blaze.base.run.filter.FileResolver;
 import com.google.idea.blaze.base.scope.output.IssueOutput;
+import com.intellij.build.events.MessageEvent.Kind;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.TextRange;
 
@@ -224,11 +222,8 @@ static class PythonCompileParser extends SingleLineParser {
     @Override
     protected IssueOutput createIssue(Matcher matcher) {
       final File file = FileResolver.resolveToFile(project, matcher.group(1));
-      return IssueOutput.issue(ERROR, matcher.group(3))
-          .inFile(file)
-          .onLine(Integer.parseInt(matcher.group(2)))
-          .consoleHyperlinkRange(
-              union(fileHighlightRange(matcher, 1), matchedTextRange(matcher, 0, 2)))
+      return IssueOutput.error(matcher.group(3))
+          .withFile(file, Integer.parseInt(matcher.group(2)), 0)
           .build();
     }
   }
@@ -254,35 +249,31 @@ static class DefaultCompileParser extends SingleLineParser {
     @Override
     protected IssueOutput createIssue(Matcher matcher) {
       final File file = FileResolver.resolveToFile(project, matcher.group(1));
-      IssueOutput.Category category = messageCategory(matcher.group(4));
-      return IssueOutput.issue(category, matcher.group(5))
-          .inFile(file)
-          .onLine(Integer.parseInt(matcher.group(2)))
-          .inColumn(parseOptionalInt(matcher.group(3)))
-          .consoleHyperlinkRange(
-              union(fileHighlightRange(matcher, 1), matchedTextRange(matcher, 2, 3)))
+      final var kind = messageKind(matcher.group(4));
+      return IssueOutput.issue(kind, matcher.group(5))
+          .withFile(file, Integer.parseInt(matcher.group(2)), parseOptionalInt(matcher.group(3)))
           .build();
     }
 
-    private static IssueOutput.Category messageCategory(@Nullable String messageType) {
+    private static Kind messageKind(@Nullable String messageType) {
       if (messageType == null) {
-        return ERROR;
+        return Kind.ERROR;
       }
       switch (Ascii.toLowerCase(messageType)) {
         case "warning":
-          return WARNING;
+          return Kind.WARNING;
         case "note":
         case "message":
         case "context":
         case "info":
-          return NOTE;
+          return Kind.INFO;
         case "error":
         case "fatal error":
         case "internal problem":
-          return ERROR;
+          return Kind.ERROR;
         default: // fall out
       }
-      return ERROR;
+      return Kind.ERROR;
     }
   }
 
@@ -314,9 +305,7 @@ public ParseResult parse(String currentLine, List<String> previousLines) {
         message.append(System.lineSeparator()).append(currentLine);
         return ParseResult.output(
             IssueOutput.error(message.toString())
-                .inFile(new File(matcher.group(2)))
-                .onLine(Integer.parseInt(matcher.group(3)))
-                .inColumn(parseOptionalInt(matcher.group(4)))
+                .withFile(new File(matcher.group(2)), Integer.parseInt(matcher.group(3)), parseOptionalInt(matcher.group(4)))
                 .build());
       }
     }
@@ -337,11 +326,7 @@ protected IssueOutput createIssue(Matcher matcher) {
       }
       File file = fileFromAbsolutePath(matcher.group(1));
       return IssueOutput.error(matcher.group(4))
-          .inFile(file)
-          .onLine(Integer.parseInt(matcher.group(2)))
-          .inColumn(parseOptionalInt(matcher.group(3)))
-          .consoleHyperlinkRange(
-              union(fileHighlightRange(matcher, 1), matchedTextRange(matcher, 2, 3)))
+          .withFile(file, Integer.parseInt(matcher.group(2)), parseOptionalInt(matcher.group(3)))
           .build();
     }
   }
@@ -355,11 +340,7 @@ static class SkylarkErrorParser extends SingleLineParser {
     protected IssueOutput createIssue(Matcher matcher) {
       File file = fileFromAbsolutePath(matcher.group(1));
       return IssueOutput.error(matcher.group(4))
-          .inFile(file)
-          .onLine(Integer.parseInt(matcher.group(2)))
-          .inColumn(parseOptionalInt(matcher.group(3)))
-          .consoleHyperlinkRange(
-              union(fileHighlightRange(matcher, 1), matchedTextRange(matcher, 2, 3)))
+          .withFile(file, Integer.parseInt(matcher.group(2)), parseOptionalInt(matcher.group(3)))
           .build();
     }
   }
@@ -372,8 +353,7 @@ static class LinelessBuildParser extends SingleLineParser {
     @Override
     protected IssueOutput createIssue(Matcher matcher) {
       return IssueOutput.error(matcher.group(2))
-          .inFile(new File(matcher.group(1)))
-          .consoleHyperlinkRange(fileHighlightRange(matcher, 1))
+          .withFile(new File(matcher.group(1)))
           .build();
     }
   }
@@ -390,8 +370,7 @@ static class FileNotFoundBuildParser extends SingleLineParser {
     protected IssueOutput createIssue(Matcher matcher) {
       File file = fileFromTarget(workspaceRoot, matcher.group(1));
       return IssueOutput.error(matcher.group(2))
-          .inFile(file)
-          .consoleHyperlinkRange(fileHighlightRange(matcher, 1))
+          .withFile(file)
           .build();
     }
   }
@@ -421,8 +400,7 @@ protected IssueOutput createIssue(Matcher matcher) {
       }
 
       return IssueOutput.error(matcher.group(0))
-          .inFile(file)
-          .consoleHyperlinkRange(fileHighlightRange(matcher, 1))
+          .withFile(file)
           .build();
     }
   }
@@ -451,7 +429,7 @@ protected IssueOutput createIssue(Matcher matcher) {
                 return false;
               });
 
-      return IssueOutput.error(matcher.group(0)).inFile(file).build();
+      return IssueOutput.error(matcher.group(0)).withFile(file).build();
     }
   }
 
diff --git a/base/src/com/google/idea/blaze/base/issueparser/IssueOutputLineProcessor.java b/base/src/com/google/idea/blaze/base/issueparser/IssueOutputLineProcessor.java
index b6734fedd3d..b3e36bf8a52 100644
--- a/base/src/com/google/idea/blaze/base/issueparser/IssueOutputLineProcessor.java
+++ b/base/src/com/google/idea/blaze/base/issueparser/IssueOutputLineProcessor.java
@@ -23,6 +23,7 @@
 import com.google.idea.blaze.base.scope.output.IssueOutput;
 import com.google.idea.blaze.common.PrintOutput;
 import com.google.idea.blaze.common.PrintOutput.OutputType;
+import com.intellij.build.events.MessageEvent.Kind;
 import com.intellij.openapi.project.Project;
 
 /**
@@ -57,7 +58,7 @@ public IssueOutputLineProcessor(
   public boolean processLine(String line) {
     IssueOutput issue = blazeIssueParser.parseIssue(line);
     if (issue != null) {
-      if (issue.getCategory() == IssueOutput.Category.ERROR) {
+      if (issue.getKind() == Kind.ERROR) {
         context.setHasError();
       }
       context.output(issue);
diff --git a/base/src/com/google/idea/blaze/base/issueparser/ToolWindowTaskIssueOutputFilter.java b/base/src/com/google/idea/blaze/base/issueparser/ToolWindowTaskIssueOutputFilter.java
index 0810e05748b..05da5094535 100644
--- a/base/src/com/google/idea/blaze/base/issueparser/ToolWindowTaskIssueOutputFilter.java
+++ b/base/src/com/google/idea/blaze/base/issueparser/ToolWindowTaskIssueOutputFilter.java
@@ -114,26 +114,7 @@ private static ResultItem dummyResult(int offset) {
    */
   @Nullable
   private static ResultItem hyperlinkItem(IssueOutput issue, int offset) {
-    TextRange range = issue.getConsoleHyperlinkRange();
-    HyperlinkInfo link = getHyperlinkInfo(issue);
-    if (range == null || link == null) {
-      return null;
-    }
-    return new ResultItem(range.getStartOffset() + offset, range.getEndOffset() + offset, link);
-  }
-
-  @Nullable
-  private static HyperlinkInfo getHyperlinkInfo(IssueOutput issue) {
-    Navigatable navigatable = issue.getNavigatable();
-    if (navigatable != null) {
-      return project -> navigatable.navigate(true);
-    }
-    VirtualFile vf = resolveVirtualFile(issue.getFile());
-    return vf != null
-        ? project ->
-            new OpenFileDescriptor(project, vf, issue.getLine() - 1, issue.getColumn() - 1)
-                .navigate(true)
-        : null;
+    return null;
   }
 
   /**
diff --git a/base/src/com/google/idea/blaze/base/projectview/ProjectViewVerifier.java b/base/src/com/google/idea/blaze/base/projectview/ProjectViewVerifier.java
index 080306c7835..179d3637b15 100644
--- a/base/src/com/google/idea/blaze/base/projectview/ProjectViewVerifier.java
+++ b/base/src/com/google/idea/blaze/base/projectview/ProjectViewVerifier.java
@@ -85,7 +85,7 @@ private static void warnAboutDeprecatedSections(
             deprecationMessage = String.format("%s is deprecated", sectionParser.getName());
           }
           IssueOutput.warn(deprecationMessage)
-              .inFile(projectViewFile.projectViewFile)
+              .withFile(projectViewFile.projectViewFile)
               .submit(context);
         }
       }
@@ -124,7 +124,7 @@ private static boolean verifyIncludedPackagesAreNotExcluded(
                 String.format(
                     "%s is included, but that contradicts %s which was excluded",
                     includedDirectory, excludedDirectory);
-            IssueOutput.error(message).inFile(projectViewFile.projectViewFile).submit(context);
+            IssueOutput.error(message).withFile(projectViewFile.projectViewFile).submit(context);
             context.output(new PrintOutput(message, OutputType.ERROR));
             ok = false;
           }
@@ -157,13 +157,13 @@ private static boolean verifyIncludedPackagesExistOnDisk(
         if (!fileOperationProvider.exists(file)) {
           String message =
               String.format("Directory '%s' specified in project view not found.", workspacePath);
-          IssueOutput.error(message).inFile(projectViewFile.projectViewFile).submit(context);
+          IssueOutput.error(message).withFile(projectViewFile.projectViewFile).submit(context);
           context.output(new PrintOutput(message, OutputType.ERROR));
           ok = false;
         } else if (!fileOperationProvider.isDirectory(file)) {
           String message =
               String.format("Directory '%s' specified in project view is a file.", workspacePath);
-          IssueOutput.error(message).inFile(projectViewFile.projectViewFile).submit(context);
+          IssueOutput.error(message).withFile(projectViewFile.projectViewFile).submit(context);
           context.output(new PrintOutput(message, OutputType.ERROR));
           ok = false;
         }
diff --git a/base/src/com/google/idea/blaze/base/projectview/parser/ParseContext.java b/base/src/com/google/idea/blaze/base/projectview/parser/ParseContext.java
index e69775ef3cb..eb28525863f 100644
--- a/base/src/com/google/idea/blaze/base/projectview/parser/ParseContext.java
+++ b/base/src/com/google/idea/blaze/base/projectview/parser/ParseContext.java
@@ -134,10 +134,10 @@ public void addErrors(List<BlazeValidationError> errors) {
   }
 
   public void addError(String error) {
-    IssueOutput.error(error).inFile(file).onLine(currentLineIndex + 1).submit(context);
+    IssueOutput.error(error).withFile(file, currentLineIndex + 1, 0).submit(context);
   }
 
   public void addWarning(String error) {
-    IssueOutput.warn(error).inFile(file).onLine(currentLineIndex + 1).submit(context);
+    IssueOutput.warn(error).withFile(file, currentLineIndex + 1, 0).submit(context);
   }
 }
diff --git a/base/src/com/google/idea/blaze/base/scope/output/IssueOutput.kt b/base/src/com/google/idea/blaze/base/scope/output/IssueOutput.kt
index 765a42846eb..cf91379e8a1 100644
--- a/base/src/com/google/idea/blaze/base/scope/output/IssueOutput.kt
+++ b/base/src/com/google/idea/blaze/base/scope/output/IssueOutput.kt
@@ -13,178 +13,114 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.idea.blaze.base.scope.output;
-
-import com.google.common.base.Objects;
-import com.google.errorprone.annotations.CanIgnoreReturnValue;
-import com.google.idea.blaze.common.Context;
-import com.google.idea.blaze.common.Output;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.pom.Navigatable;
-import java.io.File;
-import javax.annotation.Nullable;
-
-/** An issue in a blaze operation. */
-public class IssueOutput implements Output {
-
-  static final int NO_LINE = -1;
-  static final int NO_COLUMN = -1;
-
-  @Nullable private final File file;
-  private final int line;
-  private final int column;
-  private final Category category;
-  private final String message;
-  @Nullable private final Navigatable navigatable;
-  @Nullable private final TextRange consoleHyperlinkRange;
-
-  /** Issue category */
-  public enum Category {
-    ERROR,
-    WARNING,
-    NOTE,
-    STATISTICS,
-    INFORMATION,
-  }
+@file:Suppress("UnstableApiUsage")
+
+package com.google.idea.blaze.base.scope.output
+
+import com.google.idea.blaze.base.io.VfsUtils
+import com.google.idea.blaze.common.Context
+import com.google.idea.blaze.common.Output
+import com.intellij.build.events.MessageEvent
+import com.intellij.build.issue.BuildIssue
+import com.intellij.build.issue.BuildIssueQuickFix
+import com.intellij.openapi.fileEditor.OpenFileDescriptor
+import com.intellij.openapi.project.Project
+import com.intellij.pom.Navigatable
+import java.io.File
+
+/** An issue in a blaze operation.  */
+class IssueOutput (
+  issue: BuildIssue,
+  val kind: MessageEvent.Kind,
+) : Output, BuildIssue by issue {
+
+  companion object {
+    @JvmStatic
+    fun issue(kind: MessageEvent.Kind, title: String): Builder {
+      return Builder(kind, title)
+    }
 
-  public static Builder issue(Category category, String message) {
-    return new Builder(category, message);
-  }
+    @JvmStatic
+    fun error(title: String): Builder {
+      return Builder(MessageEvent.Kind.ERROR, title)
+    }
 
-  public static Builder error(String message) {
-    return new Builder(Category.ERROR, message);
+    @JvmStatic
+    fun warn(title: String): Builder {
+      return Builder(MessageEvent.Kind.WARNING, title)
+    }
   }
 
-  public static Builder warn(String message) {
-    return new Builder(Category.WARNING, message);
-  }
+  @Deprecated("used only for backwards compatibility")
+  fun getMessage(): String = "$title\n$description"
 
-  /** Builder for an issue */
-  public static class Builder {
-    private final Category category;
-    private final String message;
-    @Nullable private File file;
-    private int line = NO_LINE;
-    private int column = NO_COLUMN;
-    @Nullable Navigatable navigatable;
-    @Nullable private TextRange consoleHyperlinkRange;
-
-    public Builder(Category category, String message) {
-      this.category = category;
-      this.message = message;
-    }
+  class Builder(private val kind: MessageEvent.Kind, private val title: String) {
+    private var description: String = ""
+    private var navigatable: (Project) -> Navigatable? = { null }
+    private val fixes: MutableList<Pair<String, BuildIssueQuickFix>> = mutableListOf()
 
-    @CanIgnoreReturnValue
-    public Builder inFile(@Nullable File file) {
-      this.file = file;
-      return this;
-    }
+    fun withFile(file: File): Builder = withFile(file, line = 0, column = 0)
 
-    @CanIgnoreReturnValue
-    public Builder onLine(int line) {
-      this.line = line;
-      return this;
-    }
+    fun withFile(file: File, line: Int = 0, column: Int = 0): Builder {
+      val virtualFile = VfsUtils.resolveVirtualFile(file, false)
 
-    @CanIgnoreReturnValue
-    public Builder inColumn(int column) {
-      this.column = column;
-      return this;
-    }
+      if (virtualFile != null) {
+        navigatable = { OpenFileDescriptor(it, virtualFile, line, column) }
+      }
 
-    @CanIgnoreReturnValue
-    public Builder navigatable(@Nullable Navigatable navigatable) {
-      this.navigatable = navigatable;
-      return this;
+      return this
     }
 
-    @CanIgnoreReturnValue
-    public Builder consoleHyperlinkRange(@Nullable TextRange consoleHyperlinkRange) {
-      this.consoleHyperlinkRange = consoleHyperlinkRange;
-      return this;
+    fun withNavigatable(navigatable: Navigatable): Builder {
+      this.navigatable = { navigatable }
+      return this
     }
 
-    public IssueOutput build() {
-      return new IssueOutput(
-          file, line, column, navigatable, consoleHyperlinkRange, category, message);
+    fun withDescription(description: String): Builder {
+      this.description = description
+      return this
     }
 
-    public void submit(Context<?> context) {
-      context.output(build());
-      if (category == Category.ERROR) {
-        context.setHasError();
-      }
+    fun withFix(description: String, fix: BuildIssueQuickFix): Builder {
+      fixes.add(description to fix)
+      return this
     }
-  }
-
-  private IssueOutput(
-      @Nullable File file,
-      int line,
-      int column,
-      @Nullable Navigatable navigatable,
-      @Nullable TextRange consoleHyperlinkRange,
-      Category category,
-      String message) {
-    this.file = file;
-    this.line = line;
-    this.column = column;
-    this.navigatable = navigatable;
-    this.consoleHyperlinkRange = consoleHyperlinkRange;
-    this.category = category;
-    this.message = message;
-  }
 
-  @Nullable
-  public File getFile() {
-    return file;
-  }
+    fun build(): IssueOutput {
+      val builder = StringBuilder(description)
 
-  public int getLine() {
-    return line;
-  }
+      if (fixes.isNotEmpty()) {
+        builder.append("\n\nPossible fixes:\n")
+      }
 
-  public int getColumn() {
-    return column;
-  }
+      for ((description, fix) in fixes) {
+        builder.append("$description (<a href=\"${fix.id}\">click here</a>)")
+      }
 
-  @Nullable
-  public Navigatable getNavigatable() {
-    return navigatable;
-  }
+      val issue = object : BuildIssue {
+        override val description: String
+          get() = builder.toString()
 
-  @Nullable
-  public TextRange getConsoleHyperlinkRange() {
-    return consoleHyperlinkRange;
-  }
+        override val quickFixes: List<BuildIssueQuickFix>
+          get() = fixes.map { it.second }
 
-  public Category getCategory() {
-    return category;
-  }
+        override val title: String
+          get() = this@Builder.title
 
-  public String getMessage() {
-    return message;
-  }
-
-  @Override
-  public String toString() {
-    return message;
-  }
+        override fun getNavigatable(project: Project): Navigatable? = navigatable(project)
+      }
 
-  @Override
-  public boolean equals(Object o) {
-    if (!(o instanceof IssueOutput)) {
-      return false;
+      return IssueOutput(issue, kind)
     }
-    IssueOutput other = (IssueOutput) o;
-    return Objects.equal(file, other.file)
-        && line == other.line
-        && column == other.column
-        && category == other.category
-        && message.equals(other.message);
-  }
 
-  @Override
-  public int hashCode() {
-    return Objects.hashCode(file, line, column, category, message);
+    fun submit(context: Context<*>) {
+      context.output(build())
+      if (kind == MessageEvent.Kind.ERROR) {
+        context.setHasError()
+      }
+      if (kind == MessageEvent.Kind.WARNING) {
+        context.setHasWarnings()
+      }
+    }
   }
 }
diff --git a/base/src/com/google/idea/blaze/base/sync/SyncPhaseCoordinator.java b/base/src/com/google/idea/blaze/base/sync/SyncPhaseCoordinator.java
index 96e03703ba8..4a1105517be 100644
--- a/base/src/com/google/idea/blaze/base/sync/SyncPhaseCoordinator.java
+++ b/base/src/com/google/idea/blaze/base/sync/SyncPhaseCoordinator.java
@@ -537,17 +537,16 @@ private SyncResult syncResultFromBuildPhase(
       }
     }
     if (buildOutputs.buildResult.status == BuildResult.Status.BUILD_ERROR) {
-      String buildSystem = Blaze.buildSystemName(project);
-      String message =
-          String.format(
-              "Sync was successful, but there were %1$s build errors. "
-                  + "The project may not be fully updated or resolve until fixed. "
-                  + "If the errors are from your working set, please uncheck "
-                  + "'%1$s > Sync > Expand Sync to Working Set' and try again.",
-              buildSystem);
-      context.output(PrintOutput.error(message));
-      context.setHasWarnings();
-      IssueOutput.warn(message).submit(context);
+      final var message = String.format(
+          "The project may not be fully updated or resolve until fixed. "
+              + "If the errors are from your working set, please uncheck "
+              + "'%s > Sync > Expand Sync to Working Set' and try again.",
+          Blaze.buildSystemName(project));
+
+      IssueOutput.warn("Sync was successful, but there were build errors")
+          .withDescription(message)
+          .submit(context);
+
       return SyncResult.PARTIAL_SUCCESS;
     }
     return SyncResult.SUCCESS;
diff --git a/base/src/com/google/idea/blaze/base/sync/aspects/BlazeIdeInterfaceAspectsImpl.java b/base/src/com/google/idea/blaze/base/sync/aspects/BlazeIdeInterfaceAspectsImpl.java
index 1ba3ab64fcc..cd2212d0e32 100644
--- a/base/src/com/google/idea/blaze/base/sync/aspects/BlazeIdeInterfaceAspectsImpl.java
+++ b/base/src/com/google/idea/blaze/base/sync/aspects/BlazeIdeInterfaceAspectsImpl.java
@@ -524,7 +524,7 @@ private static void warnIgnoredLanguages(
             + "isn't enabled. Click here to enable support for: "
             + Joiner.on(", ").join(sorted);
     IssueOutput.warn(msg)
-        .navigatable(
+        .withNavigatable(
             new NavigatableAdapter() {
               @Override
               public void navigate(boolean requestFocus) {
diff --git a/base/src/com/google/idea/blaze/base/ui/problems/BlazeProblemsView.java b/base/src/com/google/idea/blaze/base/ui/problems/BlazeProblemsView.java
index a1a81589125..0f421b555bc 100644
--- a/base/src/com/google/idea/blaze/base/ui/problems/BlazeProblemsView.java
+++ b/base/src/com/google/idea/blaze/base/ui/problems/BlazeProblemsView.java
@@ -20,13 +20,13 @@
 import com.google.idea.blaze.base.scope.output.IssueOutput;
 import com.google.idea.blaze.base.settings.Blaze;
 import com.google.idea.blaze.base.settings.BlazeUserSettings.FocusBehavior;
+import com.intellij.build.events.MessageEvent.Kind;
 import com.intellij.icons.AllIcons;
 import com.intellij.ide.errorTreeView.ErrorTreeElementKind;
 import com.intellij.ide.errorTreeView.ErrorViewStructure;
 import com.intellij.ide.errorTreeView.GroupingElement;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.fileEditor.OpenFileDescriptor;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.IconLoader;
@@ -156,21 +156,16 @@ public void addMessage(IssueOutput issue, @Nullable Navigatable openInConsole) {
       issue =
           IssueOutput.warn("Too many problems found. Only showing the first " + MAX_ISSUES).build();
     }
-    VirtualFile file = issue.getFile() != null ? resolveVirtualFile(issue.getFile()) : null;
-    Navigatable navigatable = issue.getNavigatable();
-    if (navigatable == null && file != null) {
-      navigatable =
-          new OpenFileDescriptor(project, file, issue.getLine() - 1, issue.getColumn() - 1);
-    }
-    IssueOutput.Category category = issue.getCategory();
-    int type = translateCategory(category);
+    Navigatable navigatable = issue.getNavigatable(project);
+    final var kind = issue.getKind();
+    int type = translateCategory(kind);
     String[] text = convertMessage(issue);
-    String groupName = file != null ? file.getPresentableUrl() : category.name();
+    String groupName =  kind.name();
     addMessage(
         type,
         text,
         groupName,
-        file,
+        null,
         navigatable,
         openInConsole,
         getExportTextPrefix(issue),
@@ -182,7 +177,7 @@ public void addMessage(IssueOutput issue, @Nullable Navigatable openInConsole) {
     }
     boolean focus =
         focusBehavior == FocusBehavior.ALWAYS
-            || (focusBehavior == FocusBehavior.ON_ERROR && category == IssueOutput.Category.ERROR);
+            || (focusBehavior == FocusBehavior.ON_ERROR && kind == Kind.ERROR);
     if (focus) {
       didFocusProblemsView = true;
       focusProblemsView();
@@ -208,17 +203,17 @@ private static VirtualFile resolveSymlinks(VirtualFile file) {
     return resolved != null ? resolved : file;
   }
 
-  private static int translateCategory(IssueOutput.Category category) {
+  private static int translateCategory(Kind category) {
     switch (category) {
       case ERROR:
         return MessageCategory.ERROR;
       case WARNING:
         return MessageCategory.WARNING;
-      case NOTE:
+      case SIMPLE:
         return MessageCategory.NOTE;
       case STATISTICS:
         return MessageCategory.STATISTICS;
-      case INFORMATION:
+      case INFO:
         return MessageCategory.INFORMATION;
       default:
         logger.error("Unknown message category: " + category);
@@ -240,18 +235,10 @@ private static String[] convertMessage(final IssueOutput issue) {
   }
 
   private static String getExportTextPrefix(IssueOutput issue) {
-    int line = issue.getLine();
-    if (line >= 0) {
-      return String.format("line: %d", line);
-    }
     return "";
   }
 
   private static String getRenderTextPrefix(IssueOutput issue) {
-    int line = issue.getLine();
-    if (line >= 0) {
-      return String.format("(%d, %d)", line, issue.getColumn());
-    }
     return "";
   }
 
diff --git a/base/src/com/google/idea/blaze/base/ui/problems/BuildTasksProblemsView.java b/base/src/com/google/idea/blaze/base/ui/problems/BuildTasksProblemsView.java
index 7fe0df76613..f2aa5882fcc 100644
--- a/base/src/com/google/idea/blaze/base/ui/problems/BuildTasksProblemsView.java
+++ b/base/src/com/google/idea/blaze/base/ui/problems/BuildTasksProblemsView.java
@@ -20,13 +20,13 @@
 import com.google.idea.blaze.base.scope.output.IssueOutput;
 import com.google.idea.blaze.base.settings.Blaze;
 import com.google.idea.blaze.base.settings.BlazeUserSettings.FocusBehavior;
+import com.intellij.build.events.MessageEvent.Kind;
 import com.intellij.icons.AllIcons;
 import com.intellij.ide.errorTreeView.ErrorTreeElementKind;
 import com.intellij.ide.errorTreeView.ErrorViewStructure;
 import com.intellij.ide.errorTreeView.GroupingElement;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.fileEditor.OpenFileDescriptor;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.IconLoader;
@@ -163,21 +163,16 @@ public void addMessage(final IssueOutput rawIssue, @Nullable final Navigatable o
                 IssueOutput.warn("Too many problems found. Only showing the first " + MAX_ISSUES)
                     .build();
           }
-          VirtualFile file = issue.getFile() != null ? resolveVirtualFile(issue.getFile()) : null;
-          Navigatable navigatable = issue.getNavigatable();
-          if (navigatable == null && file != null) {
-            navigatable =
-                new OpenFileDescriptor(project, file, issue.getLine() - 1, issue.getColumn() - 1);
-          }
-          IssueOutput.Category category = issue.getCategory();
-          int type = translateCategory(category);
+          Navigatable navigatable = issue.getNavigatable(project);
+          final var kind = issue.getKind();
+          int type = translateKind(kind);
           String[] text = convertMessage(issue);
-          String groupName = file != null ? file.getPresentableUrl() : category.name();
+          String groupName = kind.name();
           addMessage(
               type,
               text,
               groupName,
-              file,
+              null,
               navigatable,
               openInConsole,
               getExportTextPrefix(issue),
@@ -190,7 +185,7 @@ public void addMessage(final IssueOutput rawIssue, @Nullable final Navigatable o
           boolean focus =
               focusBehavior == FocusBehavior.ALWAYS
                   || (focusBehavior == FocusBehavior.ON_ERROR
-                      && category == IssueOutput.Category.ERROR);
+                      && kind == Kind.ERROR);
           if (focus) {
             didFocusProblemsView = true;
             focusProblemsView();
@@ -217,20 +212,20 @@ private static VirtualFile resolveSymlinks(VirtualFile file) {
     return resolved != null ? resolved : file;
   }
 
-  private static int translateCategory(IssueOutput.Category category) {
-    switch (category) {
+  private static int translateKind(Kind kind) {
+    switch (kind) {
       case ERROR:
         return MessageCategory.ERROR;
       case WARNING:
         return MessageCategory.WARNING;
-      case NOTE:
-        return MessageCategory.NOTE;
+      case INFO:
+        return MessageCategory.INFORMATION;
       case STATISTICS:
         return MessageCategory.STATISTICS;
-      case INFORMATION:
-        return MessageCategory.INFORMATION;
+      case SIMPLE:
+        return MessageCategory.NOTE;
       default:
-        logger.error("Unknown message category: " + category);
+        logger.error("Unknown message kind: " + kind);
         return 0;
     }
   }
@@ -249,18 +244,10 @@ private static String[] convertMessage(final IssueOutput issue) {
   }
 
   private static String getExportTextPrefix(IssueOutput issue) {
-    int line = issue.getLine();
-    if (line >= 0) {
-      return String.format("line: %d", line);
-    }
     return "";
   }
 
   private static String getRenderTextPrefix(IssueOutput issue) {
-    int line = issue.getLine();
-    if (line >= 0) {
-      return String.format("(%d, %d)", line, issue.getColumn());
-    }
     return "";
   }
 
diff --git a/base/src/com/google/idea/blaze/base/wizard2/ui/BlazeEditProjectViewControl.java b/base/src/com/google/idea/blaze/base/wizard2/ui/BlazeEditProjectViewControl.java
index 85e5506a0bb..214df7bf50a 100644
--- a/base/src/com/google/idea/blaze/base/wizard2/ui/BlazeEditProjectViewControl.java
+++ b/base/src/com/google/idea/blaze/base/wizard2/ui/BlazeEditProjectViewControl.java
@@ -41,7 +41,6 @@
 import com.google.idea.blaze.base.scope.OutputSink.Propagation;
 import com.google.idea.blaze.base.scope.Scope;
 import com.google.idea.blaze.base.scope.output.IssueOutput;
-import com.google.idea.blaze.base.scope.output.IssueOutput.Category;
 import com.google.idea.blaze.base.settings.BuildSystemName;
 import com.google.idea.blaze.base.settings.ui.JPanelProvidingProject;
 import com.google.idea.blaze.base.settings.ui.ProjectViewUi;
@@ -57,6 +56,7 @@
 import com.google.idea.blaze.base.wizard2.ProjectDataDirectoryValidator;
 import com.google.idea.blaze.base.wizard2.WorkspaceTypeData;
 import com.google.idea.common.experiments.BoolExperiment;
+import com.intellij.build.events.MessageEvent.Kind;
 import com.intellij.icons.AllIcons;
 import com.intellij.icons.AllIcons.General;
 import com.intellij.ide.RecentProjectsManager;
@@ -551,7 +551,7 @@ private Boolean validateProjectView(BlazeContext context) {
       context.addOutputSink(
           IssueOutput.class,
           output -> {
-            if (output.getCategory() == Category.ERROR) {
+            if (output.getKind() == Kind.ERROR) {
               errors.add(output);
             }
             return Propagation.Continue;
@@ -567,7 +567,7 @@ private Boolean validateProjectView(BlazeContext context) {
   private static BlazeValidationError validationErrorFromIssueList(List<IssueOutput> issues) {
     List<IssueOutput> errors =
         issues.stream()
-            .filter(issue -> issue.getCategory() == IssueOutput.Category.ERROR)
+            .filter(issue -> issue.getKind() == Kind.ERROR)
             .collect(toList());
 
     if (!errors.isEmpty()) {
diff --git a/clwb/clwb.bazelproject b/clwb/clwb.bazelproject
index 791d8b560de..228beffd132 100644
--- a/clwb/clwb.bazelproject
+++ b/clwb/clwb.bazelproject
@@ -7,6 +7,7 @@ directories:
 
 targets:
   //clwb:all
+  //clwb:clwb_bazel_dev
 
 workspace_type: intellij_plugin
 
diff --git a/cpp/src/com/google/idea/blaze/cpp/BlazeCWorkspace.java b/cpp/src/com/google/idea/blaze/cpp/BlazeCWorkspace.java
index f01870455f2..7ac235f6f8f 100644
--- a/cpp/src/com/google/idea/blaze/cpp/BlazeCWorkspace.java
+++ b/cpp/src/com/google/idea/blaze/cpp/BlazeCWorkspace.java
@@ -500,7 +500,7 @@ private static void showSetupIssues(ImmutableList<String> issues, BlazeContext c
             "Issues collecting info from C++ compiler. Showing first few out of %d:\n%s",
             issues.size(), Iterables.limit(issues, 25)));
     IssueOutput.warn("Issues collecting info from C++ compiler (click to see logs)")
-        .navigatable(
+        .withNavigatable(
             new Navigatable() {
               @Override
               public void navigate(boolean b) {
diff --git a/cpp/src/com/google/idea/blaze/cpp/BlazeConfigurationToolchainResolver.java b/cpp/src/com/google/idea/blaze/cpp/BlazeConfigurationToolchainResolver.java
index 0e28deade17..d00873d2690 100644
--- a/cpp/src/com/google/idea/blaze/cpp/BlazeConfigurationToolchainResolver.java
+++ b/cpp/src/com/google/idea/blaze/cpp/BlazeConfigurationToolchainResolver.java
@@ -350,7 +350,7 @@ private static String getCompilerVersion(
                       "Missing execution root %s (checking compiler).\n"
                           + "Double-click to run sync and create the execution root.",
                       executionRoot.getAbsolutePath()))
-              .navigatable(
+              .withNavigatable(
                   new NavigatableAdapter() {
                     @Override
                     public void navigate(boolean requestFocus) {
diff --git a/dart/src/com/google/idea/blaze/dart/BlazeDartSyncPlugin.java b/dart/src/com/google/idea/blaze/dart/BlazeDartSyncPlugin.java
index 89e23b61497..8b8f47b1181 100644
--- a/dart/src/com/google/idea/blaze/dart/BlazeDartSyncPlugin.java
+++ b/dart/src/com/google/idea/blaze/dart/BlazeDartSyncPlugin.java
@@ -106,7 +106,7 @@ public boolean validate(
       IssueOutput.error(
               "The Dart plugin is required for Dart support. "
                   + "Click here to install/enable the plugin and restart")
-          .navigatable(PluginUtils.installOrEnablePluginNavigable(DART_PLUGIN_ID))
+          .withNavigatable(PluginUtils.installOrEnablePluginNavigable(DART_PLUGIN_ID))
           .submit(context);
       return false;
     }
diff --git a/gazelle/src/com/google/idea/blaze/gazelle/GazelleIssueParsers.java b/gazelle/src/com/google/idea/blaze/gazelle/GazelleIssueParsers.java
index e2ef2a49018..cacf8c066d6 100644
--- a/gazelle/src/com/google/idea/blaze/gazelle/GazelleIssueParsers.java
+++ b/gazelle/src/com/google/idea/blaze/gazelle/GazelleIssueParsers.java
@@ -21,7 +21,6 @@
 import com.google.idea.blaze.base.issueparser.BlazeIssueParser;
 import com.google.idea.blaze.base.run.filter.FileResolver;
 import com.google.idea.blaze.base.scope.output.IssueOutput;
-import com.google.idea.blaze.base.scope.output.IssueOutput.Category;
 import com.intellij.openapi.project.Project;
 import java.io.File;
 import java.util.regex.Matcher;
@@ -56,10 +55,8 @@ private static class GenericGazelleIssueParser extends BlazeIssueParser.SingleLi
     @Override
     protected IssueOutput createIssue(Matcher matcher) {
       final File file = FileResolver.resolveToFile(project, matcher.group(1));
-      return IssueOutput.issue(Category.ERROR, matcher.group(2))
-          .inFile(file)
-          .consoleHyperlinkRange(
-              union(fileHighlightRange(matcher, 1), matchedTextRange(matcher, 1, 1)))
+      return IssueOutput.error(matcher.group(2))
+          .withFile(file)
           .build();
     }
   }
diff --git a/golang/src/com/google/idea/blaze/golang/sync/AlwaysPresentGoSyncPlugin.java b/golang/src/com/google/idea/blaze/golang/sync/AlwaysPresentGoSyncPlugin.java
index 1884d6b21a9..67e1dd33a34 100644
--- a/golang/src/com/google/idea/blaze/golang/sync/AlwaysPresentGoSyncPlugin.java
+++ b/golang/src/com/google/idea/blaze/golang/sync/AlwaysPresentGoSyncPlugin.java
@@ -86,7 +86,7 @@ public boolean validate(
                   + "Click here to install the new JetBrains Go plugin and restart.",
               Blaze.defaultBuildSystemName());
       IssueOutput.error(error)
-          .navigatable(
+          .withNavigatable(
               new NavigatableAdapter() {
                 @Override
                 public void navigate(boolean requestFocus) {
@@ -100,7 +100,7 @@ public void navigate(boolean requestFocus) {
     IssueOutput.error(
             "Go support requires the Go plugin. Click here to install/enable the JetBrains Go "
                 + "plugin, then restart the IDE")
-        .navigatable(PluginUtils.installOrEnablePluginNavigable(GO_PLUGIN_ID))
+        .withNavigatable(PluginUtils.installOrEnablePluginNavigable(GO_PLUGIN_ID))
         .submit(context);
     return true;
   }
@@ -137,7 +137,7 @@ public boolean validateProjectView(
     BlazeSyncManager.printAndLogError(msg, context);
     msg += fixable ? ". Click here to fix your .blazeproject and resync." : ", then resync.";
     IssueOutput.error(msg)
-        .navigatable(
+        .withNavigatable(
             !fixable
                 ? null
                 : new NavigatableAdapter() {
diff --git a/ijwb/ijwb.bazelproject b/ijwb/ijwb.bazelproject
index 8271963f016..f5f6854d08a 100644
--- a/ijwb/ijwb.bazelproject
+++ b/ijwb/ijwb.bazelproject
@@ -19,3 +19,6 @@ build_flags:
 test_sources:
   */tests/unittests*
   */tests/integrationtests*
+
+additional_languages:
+  kotlin
diff --git a/java/src/com/google/idea/blaze/java/fastbuild/FastBuildCompilerFactoryImpl.java b/java/src/com/google/idea/blaze/java/fastbuild/FastBuildCompilerFactoryImpl.java
index 2224207268a..f1aead2e8bd 100644
--- a/java/src/com/google/idea/blaze/java/fastbuild/FastBuildCompilerFactoryImpl.java
+++ b/java/src/com/google/idea/blaze/java/fastbuild/FastBuildCompilerFactoryImpl.java
@@ -30,7 +30,6 @@
 import com.google.idea.blaze.base.model.primitives.Label;
 import com.google.idea.blaze.base.scope.BlazeContext;
 import com.google.idea.blaze.base.scope.output.IssueOutput;
-import com.google.idea.blaze.base.scope.output.IssueOutput.Category;
 import com.google.idea.blaze.base.scope.output.StatusOutput;
 import com.google.idea.blaze.base.sync.data.BlazeProjectDataManager;
 import com.google.idea.blaze.common.PrintOutput;
@@ -39,6 +38,7 @@
 import com.google.idea.blaze.java.fastbuild.FastBuildJavac.CompilerOutput;
 import com.google.idea.blaze.java.fastbuild.FastBuildJavac.DiagnosticLine;
 import com.google.idea.blaze.java.fastbuild.FastBuildLogDataScope.FastBuildLogOutput;
+import com.intellij.build.events.MessageEvent;
 import com.intellij.ide.plugins.IdeaPluginDescriptor;
 import com.intellij.ide.plugins.PluginManager;
 import com.intellij.openapi.diagnostic.Logger;
@@ -60,7 +60,6 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Supplier;
-import javax.tools.Diagnostic;
 import javax.tools.Diagnostic.Kind;
 
 final class FastBuildCompilerFactoryImpl implements FastBuildCompilerFactory {
@@ -354,28 +353,24 @@ private static void processDiagnostics(BlazeContext context, CompilerOutput outp
   }
 
   private static void processDiagostic(BlazeContext context, DiagnosticLine line) {
-    IssueOutput.Builder output = IssueOutput.issue(toCategory(line.kind), line.message);
+    IssueOutput.Builder output = IssueOutput.issue(toMessageKind(line.kind), line.message);
     if (line.uri != null) {
-      output.inFile(new File(line.uri));
-    }
-    if (line.lineNumber != Diagnostic.NOPOS) {
-      output.onLine((int) line.lineNumber).inColumn((int) line.columnNumber);
+      output.withFile(new File(line.uri));
     }
     context.output(output.build());
     context.output(new PrintOutput(line.formattedMessage));
   }
 
-  private static Category toCategory(Kind kind) {
+  private static MessageEvent.Kind toMessageKind(Kind kind) {
     switch (kind) {
       case ERROR:
-        return Category.ERROR;
+        return MessageEvent.Kind.ERROR;
       case MANDATORY_WARNING:
       case WARNING:
-        return Category.WARNING;
+        return MessageEvent.Kind.WARNING;
       case NOTE:
-        return Category.NOTE;
       case OTHER:
-        return Category.INFORMATION;
+        return MessageEvent.Kind.INFO;
     }
     throw new AssertionError("Unknown Kind " + kind);
   }
diff --git a/java/src/com/google/idea/blaze/java/sync/source/JavaSourcePackageReader.java b/java/src/com/google/idea/blaze/java/sync/source/JavaSourcePackageReader.java
index 7f6bdd2d202..77279b1ff95 100644
--- a/java/src/com/google/idea/blaze/java/sync/source/JavaSourcePackageReader.java
+++ b/java/src/com/google/idea/blaze/java/sync/source/JavaSourcePackageReader.java
@@ -70,7 +70,7 @@ public String getDeclaredPackageOfJavaFile(
         }
       }
       IssueOutput.warn("No package name string found in java source file: " + sourceFile)
-          .inFile(sourceFile)
+          .withFile(sourceFile)
           .submit(context);
       return null;
     } catch (FileNotFoundException e) {
diff --git a/javascript/src/com/google/idea/blaze/javascript/BlazeJavascriptSyncPlugin.java b/javascript/src/com/google/idea/blaze/javascript/BlazeJavascriptSyncPlugin.java
index 8b8cacb42ba..7d6e3d0b422 100644
--- a/javascript/src/com/google/idea/blaze/javascript/BlazeJavascriptSyncPlugin.java
+++ b/javascript/src/com/google/idea/blaze/javascript/BlazeJavascriptSyncPlugin.java
@@ -173,7 +173,7 @@ public boolean validate(
       IssueOutput.error(
               "The JavaScript plugin is required for JavaScript support. "
                   + "Click here to install/enable the plugin and restart")
-          .navigatable(PluginUtils.installOrEnablePluginNavigable(JAVASCRIPT_PLUGIN_ID))
+          .withNavigatable(PluginUtils.installOrEnablePluginNavigable(JAVASCRIPT_PLUGIN_ID))
           .submit(context);
       return false;
     }
diff --git a/javascript/src/com/google/idea/blaze/typescript/BlazeTypescriptSyncPlugin.java b/javascript/src/com/google/idea/blaze/typescript/BlazeTypescriptSyncPlugin.java
index 33349a48b58..b9d01934e8a 100644
--- a/javascript/src/com/google/idea/blaze/typescript/BlazeTypescriptSyncPlugin.java
+++ b/javascript/src/com/google/idea/blaze/typescript/BlazeTypescriptSyncPlugin.java
@@ -226,7 +226,7 @@ public boolean validate(
       IssueOutput.error(
               "The JavaScript plugin is required for TypeScript support. "
                   + "Click here to install/enable the plugin and restart")
-          .navigatable(PluginUtils.installOrEnablePluginNavigable(TYPESCRIPT_PLUGIN_ID))
+          .withNavigatable(PluginUtils.installOrEnablePluginNavigable(TYPESCRIPT_PLUGIN_ID))
           .submit(context);
       return false;
     }
@@ -281,7 +281,7 @@ public void navigate(boolean requestFocus) {
             }
           };
     }
-    IssueOutput.error(errorNote).navigatable(navigatable).submit(context);
+    IssueOutput.error(errorNote).withNavigatable(navigatable).submit(context);
   }
 
   private static Set<Label> getTsConfigTargets(ProjectViewSet projectViewSet) {
diff --git a/kotlin/src/com/google/idea/blaze/kotlin/sync/AlwaysPresentKotlinSyncPlugin.java b/kotlin/src/com/google/idea/blaze/kotlin/sync/AlwaysPresentKotlinSyncPlugin.java
index de9e596d20b..c3844b72389 100644
--- a/kotlin/src/com/google/idea/blaze/kotlin/sync/AlwaysPresentKotlinSyncPlugin.java
+++ b/kotlin/src/com/google/idea/blaze/kotlin/sync/AlwaysPresentKotlinSyncPlugin.java
@@ -72,7 +72,7 @@ public boolean validateProjectView(
                 + "plugin, then restart the IDE",
             fixable ? "Click here to" : "Please");
     IssueOutput.error(message)
-        .navigatable(PluginUtils.installOrEnablePluginNavigable(KOTLIN_PLUGIN_ID))
+        .withNavigatable(PluginUtils.installOrEnablePluginNavigable(KOTLIN_PLUGIN_ID))
         .submit(context);
     BlazeSyncManager.printAndLogError(
         "Kotlin support requires the Kotlin plugin. Please install/enable the Kotlin "
diff --git a/python/src/com/google/idea/blaze/python/issueparser/PyIssueParserProvider.java b/python/src/com/google/idea/blaze/python/issueparser/PyIssueParserProvider.java
index 5b809e483a3..deb92aa0cad 100644
--- a/python/src/com/google/idea/blaze/python/issueparser/PyIssueParserProvider.java
+++ b/python/src/com/google/idea/blaze/python/issueparser/PyIssueParserProvider.java
@@ -69,15 +69,9 @@ protected IssueOutput createIssue(Matcher matcher) {
       }
       // don't try to find PsiFiles here, just assume it's a relative path
       File file = BlazeIssueParser.fileFromRelativePath(workspaceRoot, fileNameOrPath);
-      TextRange highlightRange =
-          BlazeIssueParser.union(
-              BlazeIssueParser.fileHighlightRange(matcher, 1),
-              BlazeIssueParser.matchedTextRange(matcher, 2, 2));
       return IssueOutput.error(matcher.group(0))
-          .inFile(file)
-          .onLine(parseLineNumber(matcher.group(2)))
-          .navigatable(openFileNavigatable(fileNameOrPath, parseLineNumber(matcher.group(2))))
-          .consoleHyperlinkRange(highlightRange)
+          .withFile(file, parseLineNumber(matcher.group(2)), 0)
+          .withNavigatable(openFileNavigatable(fileNameOrPath, parseLineNumber(matcher.group(2))))
           .build();
     }
 
diff --git a/python/src/com/google/idea/blaze/python/sync/AlwaysPresentPythonSyncPlugin.java b/python/src/com/google/idea/blaze/python/sync/AlwaysPresentPythonSyncPlugin.java
index 822c1b4e191..4a1a186ae90 100644
--- a/python/src/com/google/idea/blaze/python/sync/AlwaysPresentPythonSyncPlugin.java
+++ b/python/src/com/google/idea/blaze/python/sync/AlwaysPresentPythonSyncPlugin.java
@@ -76,7 +76,7 @@ public boolean validate(
       IssueOutput.warn(
               "Your project appears to contain Python targets. To enable Python support, "
                   + "install/enable the JetBrains python plugin, then restart the IDE")
-          .navigatable(PluginUtils.installOrEnablePluginNavigable(pluginId))
+          .withNavigatable(PluginUtils.installOrEnablePluginNavigable(pluginId))
           .submit(context);
       return false;
     }
diff --git a/python/src/com/google/idea/blaze/python/sync/BlazePythonSyncPlugin.java b/python/src/com/google/idea/blaze/python/sync/BlazePythonSyncPlugin.java
index 528786df2fa..28096d8e0b4 100644
--- a/python/src/com/google/idea/blaze/python/sync/BlazePythonSyncPlugin.java
+++ b/python/src/com/google/idea/blaze/python/sync/BlazePythonSyncPlugin.java
@@ -458,7 +458,7 @@ public boolean validateProjectView(
               ? "Click here to remove it, retaining python support"
               : "Please remove it and resync.";
       IssueOutput.error(msg)
-          .navigatable(
+          .withNavigatable(
               project == null || !fixable
                   ? null
                   : new NavigatableAdapter() {
diff --git a/scala/src/com/google/idea/blaze/scala/sync/AlwaysPresentScalaSyncPlugin.java b/scala/src/com/google/idea/blaze/scala/sync/AlwaysPresentScalaSyncPlugin.java
index fa40f2191e0..35f37f66be9 100644
--- a/scala/src/com/google/idea/blaze/scala/sync/AlwaysPresentScalaSyncPlugin.java
+++ b/scala/src/com/google/idea/blaze/scala/sync/AlwaysPresentScalaSyncPlugin.java
@@ -65,7 +65,7 @@ public boolean validateProjectView(
     if (!PluginUtils.isPluginEnabled(SCALA_PLUGIN_ID)) {
       String msg = "Scala plugin needed for Scala language support.";
       IssueOutput.error(msg)
-          .navigatable(PluginUtils.installOrEnablePluginNavigable(SCALA_PLUGIN_ID))
+          .withNavigatable(PluginUtils.installOrEnablePluginNavigable(SCALA_PLUGIN_ID))
           .submit(context);
       BlazeSyncManager.printAndLogError(msg, context);
       return false;

From 39833b033347b0a0ae5847385c16e01fc20c9289 Mon Sep 17 00:00:00 2001
From: Daniel Brauner <daniel.brauner@jetbrains.com>
Date: Thu, 19 Sep 2024 18:09:25 +0200
Subject: [PATCH 04/17] added build view

---
 base/src/META-INF/blaze-base.xml              |  4 +
 .../async/executor/ProgressIndicatorStub.kt   | 62 +++++++++++++
 .../ProgressiveTaskWithProgressIndicator.java |  7 +-
 .../base/buildview/BuildViewMigration.kt      | 24 +++++
 .../blaze/base/buildview/BuildViewScope.kt    | 91 +++++++++++++++++++
 .../idea/blaze/base/buildview/ContextExt.kt   | 27 ++++++
 .../base/buildview/events/BuildEventParser.kt | 18 ++++
 .../idea/blaze/base/command/BlazeCommand.java |  8 ++
 .../base/scope/scopes/ProblemsViewScope.java  |  3 +
 .../base/scope/scopes/ToolWindowScope.java    | 10 ++
 .../blaze/base/sync/BlazeSyncManager.java     | 28 ++++--
 .../blaze/base/sync/BuildPhaseSyncTask.java   |  2 +
 .../blaze/base/sync/SyncPhaseCoordinator.java |  4 +
 .../base/sync/SyncProjectTargetsHelper.java   | 47 +++++-----
 .../data/AspectSyncProjectDataManager.java    |  2 +
 15 files changed, 306 insertions(+), 31 deletions(-)
 create mode 100644 base/src/com/google/idea/blaze/base/async/executor/ProgressIndicatorStub.kt
 create mode 100644 base/src/com/google/idea/blaze/base/buildview/BuildViewMigration.kt
 create mode 100644 base/src/com/google/idea/blaze/base/buildview/BuildViewScope.kt
 create mode 100644 base/src/com/google/idea/blaze/base/buildview/ContextExt.kt
 create mode 100644 base/src/com/google/idea/blaze/base/buildview/events/BuildEventParser.kt

diff --git a/base/src/META-INF/blaze-base.xml b/base/src/META-INF/blaze-base.xml
index 34ad207f953..bc4eaafc3d1 100644
--- a/base/src/META-INF/blaze-base.xml
+++ b/base/src/META-INF/blaze-base.xml
@@ -408,6 +408,9 @@
     <registryKey defaultValue="true"
                  description="Causes the plugin to read external workspace data, enabling features such as code completion for external targets. This may incur the cost of an additional 'bazel mod' call, which could cause issues with older versions or setups."
                  key="bazel.read.external.workspace.data"/>
+    <registryKey defaultValue="true"
+                 description="Enables the new sync view"
+                 key="bazel.new.sync.view"/>
     <editorNotificationProvider implementation="com.google.idea.blaze.base.wizard2.BazelNotificationProvider"/>
   </extensions>
 
@@ -587,6 +590,7 @@
     <extensionPoint qualifiedName="com.google.idea.blaze.OutputGroupsProvider" interface="com.google.idea.blaze.base.sync.aspects.strategy.OutputGroupsProvider"/>
     <extensionPoint qualifiedName="com.google.idea.blaze.ExperimentLoader" interface="com.google.idea.common.experiments.ExperimentLoader"/>
     <extensionPoint qualifiedName="com.google.idea.blaze.EmptyLibraryFilterSettings" interface="com.google.idea.blaze.java.sync.importer.emptylibrary.EmptyLibraryFilterSettings" />
+    <extensionPoint qualifiedName="com.google.idea.blaze.BuildEventParser" interface="com.google.idea.blaze.base.buildview.events.BuildEventParser" />
   </extensionPoints>
 
   <extensions defaultExtensionNs="com.google.idea.blaze">
diff --git a/base/src/com/google/idea/blaze/base/async/executor/ProgressIndicatorStub.kt b/base/src/com/google/idea/blaze/base/async/executor/ProgressIndicatorStub.kt
new file mode 100644
index 00000000000..cb3f271855b
--- /dev/null
+++ b/base/src/com/google/idea/blaze/base/async/executor/ProgressIndicatorStub.kt
@@ -0,0 +1,62 @@
+package com.google.idea.blaze.base.async.executor
+
+import com.intellij.openapi.application.ModalityState
+import com.intellij.openapi.progress.ProgressIndicator
+import com.intellij.openapi.progress.TaskInfo
+import com.intellij.openapi.wm.ex.ProgressIndicatorEx
+
+object ProgressIndicatorStub : ProgressIndicatorEx {
+  override fun start() { }
+
+  override fun stop() { }
+
+  override fun isRunning(): Boolean { return false }
+
+  override fun cancel() { }
+
+  override fun isCanceled(): Boolean { return false }
+
+  override fun setText(p0: String?) { }
+
+  override fun getText(): String { return "" }
+
+  override fun setText2(p0: String?) { }
+
+  override fun getText2(): String { return "" }
+
+  override fun getFraction(): Double { return 0.0 }
+
+  override fun setFraction(p0: Double) { }
+
+  override fun pushState() { }
+
+  override fun popState() { }
+
+  override fun isModal(): Boolean { return false }
+
+  override fun getModalityState(): ModalityState { return ModalityState.defaultModalityState() }
+
+  override fun setModalityProgress(p0: ProgressIndicator?) { }
+
+  override fun isIndeterminate(): Boolean { return false; }
+
+  override fun setIndeterminate(p0: Boolean) { }
+
+  override fun checkCanceled() { }
+
+  override fun isPopupWasShown(): Boolean { return false; }
+
+  override fun isShowing(): Boolean { return false; }
+
+  override fun addStateDelegate(p0: ProgressIndicatorEx) { }
+
+  override fun finish(p0: TaskInfo) { }
+
+  override fun isFinished(p0: TaskInfo): Boolean { return false; }
+
+  override fun wasStarted(): Boolean { return false; }
+
+  override fun processFinish() { }
+
+  override fun initStateFrom(p0: ProgressIndicator) { }
+}
\ No newline at end of file
diff --git a/base/src/com/google/idea/blaze/base/async/executor/ProgressiveTaskWithProgressIndicator.java b/base/src/com/google/idea/blaze/base/async/executor/ProgressiveTaskWithProgressIndicator.java
index f7b0c15f8bd..8511e931108 100644
--- a/base/src/com/google/idea/blaze/base/async/executor/ProgressiveTaskWithProgressIndicator.java
+++ b/base/src/com/google/idea/blaze/base/async/executor/ProgressiveTaskWithProgressIndicator.java
@@ -40,7 +40,8 @@ public class ProgressiveTaskWithProgressIndicator {
   public enum Modality {
     MODAL, // This task must start in the foreground and stay there.
     BACKGROUNDABLE, // This task will start in the foreground, but can be sent to the background.
-    ALWAYS_BACKGROUND // This task will start in the background and stay there.
+    ALWAYS_BACKGROUND, // This task will start in the background and stay there.
+    BUILD_VIEW // Progress of this task is tracked in the build view
   }
 
   @Nullable private final Project project;
@@ -104,6 +105,10 @@ public void submitTaskLater(Progressive progressive) {
    * progress dialog.
    */
   public <T> ListenableFuture<T> submitTaskWithResult(ProgressiveWithResult<T> progressive) {
+    if (modality == Modality.BUILD_VIEW) {
+      return executor.submit(() -> progressive.compute(ProgressIndicatorStub.INSTANCE));
+    }
+
     // The progress indicator must be created on the UI thread.
     final ProgressWindow indicator =
         UIUtil.invokeAndWaitIfNeeded(
diff --git a/base/src/com/google/idea/blaze/base/buildview/BuildViewMigration.kt b/base/src/com/google/idea/blaze/base/buildview/BuildViewMigration.kt
new file mode 100644
index 00000000000..34796e2ea92
--- /dev/null
+++ b/base/src/com/google/idea/blaze/base/buildview/BuildViewMigration.kt
@@ -0,0 +1,24 @@
+package com.google.idea.blaze.base.buildview
+
+import com.google.idea.blaze.base.async.executor.ProgressiveTaskWithProgressIndicator
+import com.google.idea.blaze.base.scope.BlazeContext
+import com.intellij.openapi.util.registry.Registry
+
+object BuildViewMigration {
+  @JvmStatic
+  val enabled get(): Boolean = Registry.`is`("bazel.new.sync.view")
+
+  @JvmStatic
+  fun present(ctx: BlazeContext): Boolean {
+    return ctx.getScope(BuildViewScope::class.java) != null
+  }
+
+  @JvmStatic
+  fun progressModality(): ProgressiveTaskWithProgressIndicator.Modality {
+    return if (enabled) {
+      ProgressiveTaskWithProgressIndicator.Modality.BUILD_VIEW
+    } else {
+      ProgressiveTaskWithProgressIndicator.Modality.ALWAYS_BACKGROUND
+    }
+  }
+}
\ No newline at end of file
diff --git a/base/src/com/google/idea/blaze/base/buildview/BuildViewScope.kt b/base/src/com/google/idea/blaze/base/buildview/BuildViewScope.kt
new file mode 100644
index 00000000000..bf58cb72be8
--- /dev/null
+++ b/base/src/com/google/idea/blaze/base/buildview/BuildViewScope.kt
@@ -0,0 +1,91 @@
+@file:Suppress("UnstableApiUsage")
+
+package com.google.idea.blaze.base.buildview
+
+import com.google.idea.blaze.base.scope.BlazeContext
+import com.google.idea.blaze.base.scope.BlazeScope
+import com.google.idea.blaze.base.scope.OutputSink
+import com.google.idea.blaze.base.scope.output.IssueOutput
+import com.google.idea.blaze.base.scope.output.StatusOutput
+import com.google.idea.blaze.common.Output
+import com.google.idea.blaze.common.PrintOutput
+import com.intellij.build.BuildDescriptor
+import com.intellij.build.DefaultBuildDescriptor
+import com.intellij.build.SyncViewManager
+import com.intellij.build.progress.BuildProgress
+import com.intellij.build.progress.BuildProgressDescriptor
+import com.intellij.icons.AllIcons
+import com.intellij.openapi.actionSystem.ActionUpdateThread
+import com.intellij.openapi.actionSystem.AnAction
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.project.Project
+import java.util.function.Consumer
+
+class BuildViewScope(project: Project, private val title: String) : BlazeScope {
+  companion object {
+    @JvmStatic
+    fun of(ctx: BlazeContext): BuildViewScope? = ctx.getScope(BuildViewScope::class.java)
+  }
+
+  private var progress = SyncViewManager.createBuildProgress(project)
+
+  override fun onScopeBegin(ctx: BlazeContext) {
+    progress.start(ProgressDescriptor(title, ctx))
+
+    addOutputSink<PrintOutput>(ctx) {
+      progress.output(it.text + '\n', true)
+    }
+    addOutputSink<StatusOutput>(ctx) {
+      progress.output(it.status + '\n', true)
+    }
+    addOutputSink<IssueOutput>(ctx) {
+      progress.buildIssue(it, it.kind)
+    }
+  }
+
+  private inline fun <reified T : Output> addOutputSink(ctx: BlazeContext, consumer: Consumer<T>) {
+    ctx.addOutputSink(T::class.java) { it: T ->
+      consumer.accept(it)
+      OutputSink.Propagation.Stop
+    }
+  }
+
+  override fun onScopeEnd(ctx: BlazeContext) {
+    val progress = this.progress ?: return
+
+    when {
+      ctx.isCancelled -> progress.cancel()
+      ctx.hasErrors() -> progress.fail()
+      else -> progress.finish()
+    }
+  }
+
+  fun startProgress(title: String): BuildProgress<BuildProgressDescriptor>? {
+    return progress?.progress(title)
+  }
+}
+
+private class ProgressDescriptor(private val title: String, ctx: BlazeContext) :
+  BuildProgressDescriptor {
+  private val descriptor = DefaultBuildDescriptor(Any(), title, "", System.currentTimeMillis())
+    .withRestartAction(RestartAction(ctx))
+
+  override fun getTitle(): String = title
+
+  override fun getBuildDescriptor(): BuildDescriptor = descriptor
+}
+
+private class RestartAction(private val ctx: BlazeContext) :
+  AnAction({ "Stop" }, AllIcons.Actions.Suspend) {
+  override fun actionPerformed(event: AnActionEvent) {
+    ctx.setCancelled()
+  }
+
+  override fun update(event: AnActionEvent) {
+    event.presentation.isEnabled = !ctx.isCancelled && !ctx.isEnding
+  }
+
+  override fun getActionUpdateThread(): ActionUpdateThread {
+    return ActionUpdateThread.BGT
+  }
+}
diff --git a/base/src/com/google/idea/blaze/base/buildview/ContextExt.kt b/base/src/com/google/idea/blaze/base/buildview/ContextExt.kt
new file mode 100644
index 00000000000..550affb194a
--- /dev/null
+++ b/base/src/com/google/idea/blaze/base/buildview/ContextExt.kt
@@ -0,0 +1,27 @@
+package com.google.idea.blaze.base.buildview
+
+import com.google.idea.blaze.base.scope.BlazeContext
+import com.google.idea.blaze.base.scope.BlazeScope
+import com.google.idea.blaze.common.PrintOutput
+import com.intellij.openapi.progress.runBlockingMaybeCancellable
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+
+fun BlazeContext.println(msg: String) {
+  output(PrintOutput(msg))
+}
+
+fun <T> BlazeContext.pushJob(scope: CoroutineScope, block: suspend CoroutineScope.() -> T): T {
+  val deferred = scope.async(Dispatchers.IO) { block() }
+
+  push(object : BlazeScope {
+    override fun onScopeEnd(context: BlazeContext?) {
+      deferred.cancel()
+    }
+  })
+
+  return runBlockingMaybeCancellable {
+    deferred.await()
+  }
+}
\ No newline at end of file
diff --git a/base/src/com/google/idea/blaze/base/buildview/events/BuildEventParser.kt b/base/src/com/google/idea/blaze/base/buildview/events/BuildEventParser.kt
new file mode 100644
index 00000000000..c4091de64c1
--- /dev/null
+++ b/base/src/com/google/idea/blaze/base/buildview/events/BuildEventParser.kt
@@ -0,0 +1,18 @@
+package com.google.idea.blaze.base.buildview.events
+
+import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.BuildEvent
+import com.google.idea.blaze.base.scope.output.IssueOutput
+import com.intellij.openapi.extensions.ExtensionPointName
+
+interface BuildEventParser {
+  companion object {
+    val EP_NAME: ExtensionPointName<BuildEventParser> =
+      ExtensionPointName.create("com.google.idea.blaze.BuildEventParser")
+
+    fun parse(event: BuildEvent): IssueOutput? {
+      return EP_NAME.extensions.firstNotNullOfOrNull { it.parse(event) }
+    }
+  }
+
+  fun parse(event: BuildEvent): IssueOutput?
+}
diff --git a/base/src/com/google/idea/blaze/base/command/BlazeCommand.java b/base/src/com/google/idea/blaze/base/command/BlazeCommand.java
index d2c0b68c9e8..d33d7c911bd 100644
--- a/base/src/com/google/idea/blaze/base/command/BlazeCommand.java
+++ b/base/src/com/google/idea/blaze/base/command/BlazeCommand.java
@@ -56,6 +56,10 @@ public BlazeCommandName getName() {
     return name;
   }
 
+  public String getBinaryPath() {
+    return binaryPath;
+  }
+
   public ImmutableList<String> toArgumentList() {
     return ImmutableList.<String>builder()
         .addAll(blazeStartupFlags)
@@ -115,6 +119,10 @@ public Builder(String binaryPath, BlazeCommandName name, Project project) {
       AspectRepositoryProvider.getOverrideFlag(project).ifPresent(this::addBlazeFlags);
     }
 
+    public BlazeCommandName getName() {
+      return name;
+    }
+
     private ImmutableList<String> getArguments() {
       ImmutableList.Builder<String> arguments = ImmutableList.builder();
       arguments.addAll(blazeCmdlineFlags.build());
diff --git a/base/src/com/google/idea/blaze/base/scope/scopes/ProblemsViewScope.java b/base/src/com/google/idea/blaze/base/scope/scopes/ProblemsViewScope.java
index 34e48711aa4..d3e71051111 100644
--- a/base/src/com/google/idea/blaze/base/scope/scopes/ProblemsViewScope.java
+++ b/base/src/com/google/idea/blaze/base/scope/scopes/ProblemsViewScope.java
@@ -15,6 +15,7 @@
  */
 package com.google.idea.blaze.base.scope.scopes;
 
+import com.google.idea.blaze.base.buildview.BuildViewMigration;
 import com.google.idea.blaze.base.scope.BlazeContext;
 import com.google.idea.blaze.base.scope.BlazeScope;
 import com.google.idea.blaze.base.scope.OutputSink;
@@ -43,6 +44,8 @@ public ProblemsViewScope(
 
   @Override
   public void onScopeBegin(BlazeContext context) {
+    if (BuildViewMigration.present(context)) return;
+
     context.addOutputSink(IssueOutput.class, this);
     if (resetProblemsContext) {
         BuildTasksProblemsView.getInstance(project).newProblemsContext(problemsViewFocusBehavior);
diff --git a/base/src/com/google/idea/blaze/base/scope/scopes/ToolWindowScope.java b/base/src/com/google/idea/blaze/base/scope/scopes/ToolWindowScope.java
index 4d934893386..18c0a61956d 100644
--- a/base/src/com/google/idea/blaze/base/scope/scopes/ToolWindowScope.java
+++ b/base/src/com/google/idea/blaze/base/scope/scopes/ToolWindowScope.java
@@ -18,6 +18,8 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Sets;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
+import com.google.idea.blaze.base.buildview.BuildViewMigration;
+import com.google.idea.blaze.base.buildview.BuildViewScope;
 import com.google.idea.blaze.base.issueparser.BlazeIssueParser;
 import com.google.idea.blaze.base.issueparser.ToolWindowTaskIssueOutputFilter;
 import com.google.idea.blaze.base.scope.BlazeContext;
@@ -186,6 +188,12 @@ private ToolWindowScope(
 
   @Override
   public void onScopeBegin(BlazeContext context) {
+    final var buildView = BuildViewScope.of(context);
+    if (buildView != null) {
+      buildView.startProgress(task.getName());
+      return;
+    }
+
     context.addOutputSink(PrintOutput.class, printSink);
     context.addOutputSink(StatusOutput.class, statusSink);
     context.addOutputSink(StateUpdate.class, stateSink);
@@ -222,6 +230,8 @@ private static Task.Status statusForContext(BlazeContext context) {
 
   @Override
   public void onScopeEnd(BlazeContext context) {
+    if (BuildViewMigration.present(context)) return;
+
     if (finishTaskOnScopeEnd) {
       tasksToolWindowController.finishTask(task, statusForContext(context));
     }
diff --git a/base/src/com/google/idea/blaze/base/sync/BlazeSyncManager.java b/base/src/com/google/idea/blaze/base/sync/BlazeSyncManager.java
index 2c0dfed2e7f..945bf42b49c 100644
--- a/base/src/com/google/idea/blaze/base/sync/BlazeSyncManager.java
+++ b/base/src/com/google/idea/blaze/base/sync/BlazeSyncManager.java
@@ -22,6 +22,8 @@
 import com.google.common.collect.Sets;
 import com.google.common.collect.Sets.SetView;
 import com.google.idea.blaze.base.async.executor.ProgressiveTaskWithProgressIndicator;
+import com.google.idea.blaze.base.buildview.BuildViewMigration;
+import com.google.idea.blaze.base.buildview.BuildViewScope;
 import com.google.idea.blaze.base.command.BlazeInvocationContext.ContextType;
 import com.google.idea.blaze.base.ideinfo.TargetKey;
 import com.google.idea.blaze.base.issueparser.BlazeIssueParser;
@@ -60,6 +62,7 @@
 import com.intellij.openapi.project.DumbService;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.startup.StartupManager;
+import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.util.text.StringUtil;
 import java.util.Collection;
 import java.util.concurrent.CancellationException;
@@ -111,10 +114,16 @@ public void requestProjectSync(BlazeSyncParams syncParams) {
             () -> {
               Future<Void> unusedFuture =
                   ProgressiveTaskWithProgressIndicator.builder(project, "Initiating project sync")
+                      .setModality(BuildViewMigration.progressModality())
                       .submitTask(
                           indicator ->
                               Scope.root(
                                   context -> {
+                                    if (Registry.is("bazel.new.sync.view")) {
+                                      context.push(new BuildViewScope(project,
+                                          getRootInvocationTitle(syncParams)));
+                                    }
+
                                     context
                                         .push(new ProgressIndicatorScope(indicator))
                                         .push(buildToolWindowScope(syncParams, indicator))
@@ -123,6 +132,7 @@ public void requestProjectSync(BlazeSyncParams syncParams) {
                                                 project,
                                                 BlazeUserSettings.getInstance()
                                                     .getShowProblemsViewOnSync()));
+
                                     if (!runInitialDirectoryOnlySync(syncParams)) {
                                       executeTask(project, syncParams, context);
                                       return;
@@ -224,20 +234,22 @@ private static void executeTask(Project project, BlazeSyncParams params, BlazeCo
     }
   }
 
-  private Task getRootInvocationTask(BlazeSyncParams params) {
-    String taskTitle;
+  private String getRootInvocationTitle(BlazeSyncParams params) {
     if (params.syncMode() == SyncMode.STARTUP) {
-      taskTitle = "Startup Sync";
+      return "Startup Sync";
     } else if (params.syncOrigin().equals(BlazeSyncStartupActivity.SYNC_REASON)) {
-      taskTitle = "Importing " + project.getName();
+      return "Importing " + project.getName();
     } else if (params.syncMode() == SyncMode.PARTIAL) {
-      taskTitle = "Partial Sync";
+      return "Partial Sync";
     } else if (params.syncMode() == SyncMode.FULL) {
-      taskTitle = "Non-Incremental Sync";
+      return "Non-Incremental Sync";
     } else {
-      taskTitle = "Incremental Sync";
+      return "Incremental Sync";
     }
-    return new Task(project, taskTitle, Task.Type.SYNC);
+  }
+
+  private Task getRootInvocationTask(BlazeSyncParams params) {
+    return new Task(project, getRootInvocationTitle(params), Task.Type.SYNC);
   }
 
   private BlazeScope buildToolWindowScope(BlazeSyncParams syncParams, ProgressIndicator indicator) {
diff --git a/base/src/com/google/idea/blaze/base/sync/BuildPhaseSyncTask.java b/base/src/com/google/idea/blaze/base/sync/BuildPhaseSyncTask.java
index 1eac00b906f..ed1f476a0cd 100644
--- a/base/src/com/google/idea/blaze/base/sync/BuildPhaseSyncTask.java
+++ b/base/src/com/google/idea/blaze/base/sync/BuildPhaseSyncTask.java
@@ -25,6 +25,7 @@
 import com.google.idea.blaze.base.bazel.BuildSystem;
 import com.google.idea.blaze.base.bazel.BuildSystem.BuildInvoker;
 import com.google.idea.blaze.base.bazel.BuildSystem.SyncStrategy;
+import com.google.idea.blaze.base.buildview.BuildViewMigration;
 import com.google.idea.blaze.base.command.BlazeInvocationContext;
 import com.google.idea.blaze.base.command.BlazeInvocationContext.ContextType;
 import com.google.idea.blaze.base.command.BlazercMigrator;
@@ -384,6 +385,7 @@ private ImmutableList<TargetExpression> findTargetsBuildingSourceFiles(
     String title = "Query targets building source files";
     List<TargetInfo> result =
         ProgressiveTaskWithProgressIndicator.builder(project, title)
+            .setModality(BuildViewMigration.progressModality())
             .submitTaskWithResult(
                 indicator -> Scope.push(
                     context,
diff --git a/base/src/com/google/idea/blaze/base/sync/SyncPhaseCoordinator.java b/base/src/com/google/idea/blaze/base/sync/SyncPhaseCoordinator.java
index 4a1105517be..9cc7baf4987 100644
--- a/base/src/com/google/idea/blaze/base/sync/SyncPhaseCoordinator.java
+++ b/base/src/com/google/idea/blaze/base/sync/SyncPhaseCoordinator.java
@@ -28,6 +28,7 @@
 import com.google.idea.blaze.base.async.executor.ProgressiveTaskWithProgressIndicator;
 import com.google.idea.blaze.base.bazel.BuildSystem;
 import com.google.idea.blaze.base.bazel.BuildSystem.SyncStrategy;
+import com.google.idea.blaze.base.buildview.BuildViewMigration;
 import com.google.idea.blaze.base.command.BlazeInvocationContext.ContextType;
 import com.google.idea.blaze.base.experiments.ExperimentScope;
 import com.google.idea.blaze.base.ideinfo.TargetKey;
@@ -234,6 +235,7 @@ ListenableFuture<Void> syncProject(BlazeSyncParams syncParams, BlazeContext pare
     boolean singleThreaded = !useRemoteExecutor(syncParams);
     return ProgressiveTaskWithProgressIndicator.builder(project, "Syncing Project")
         .setExecutor(singleThreaded ? singleThreadedExecutor : remoteBuildExecutor)
+        .setModality(BuildViewMigration.progressModality())
         .submitTask(
             indicator ->
                 Scope.push(
@@ -282,6 +284,7 @@ void filterProjectTargets(Predicate<TargetKey> filter, String reason) {
     Future<?> possiblyIgnoredError =
         ProgressiveTaskWithProgressIndicator.builder(project, "Filtering Project Targets")
             .setExecutor(singleThreadedExecutor)
+            .setModality(BuildViewMigration.progressModality())
             .submitTask(
                 indicator ->
                     Scope.root(
@@ -495,6 +498,7 @@ private void queueUpdateTask(UpdatePhaseTask task) {
 
     ProgressiveTaskWithProgressIndicator.builder(project, "Syncing Project")
         .setExecutor(singleThreadedExecutor)
+        .setModality(BuildViewMigration.progressModality())
         .submitTaskLater(
             indicator ->
                 Scope.root(
diff --git a/base/src/com/google/idea/blaze/base/sync/SyncProjectTargetsHelper.java b/base/src/com/google/idea/blaze/base/sync/SyncProjectTargetsHelper.java
index 8825b8528f8..e22886e2e0e 100644
--- a/base/src/com/google/idea/blaze/base/sync/SyncProjectTargetsHelper.java
+++ b/base/src/com/google/idea/blaze/base/sync/SyncProjectTargetsHelper.java
@@ -20,6 +20,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.idea.blaze.base.async.executor.ProgressiveTaskWithProgressIndicator;
+import com.google.idea.blaze.base.buildview.BuildViewMigration;
 import com.google.idea.blaze.base.dependencies.DirectoryToTargetProvider;
 import com.google.idea.blaze.base.dependencies.SourceToTargetFilteringStrategy;
 import com.google.idea.blaze.base.dependencies.TargetInfo;
@@ -124,28 +125,30 @@ private static ImmutableList<TargetExpression> deriveTargetsFromDirectories(
     }
     String title = "Query targets in project directories";
     List<TargetInfo> targets =
-        ProgressiveTaskWithProgressIndicator.builder(project, title).submitTaskWithResult(indicator ->
-            Scope.push(
-                context,
-                childContext -> {
-                  childContext.push(
-                      new TimingScope("QueryDirectoryTargets", EventType.BlazeInvocation));
-                  childContext.output(new StatusOutput("Querying targets in project directories..."));
-                  var scope = childContext.getScope(ToolWindowScope.class);
-                  if (scope != null) { // If ToolWindowScope doesn't already exist, it means the output is not supposed to be printed to toolwindow (for example in tests)
-                    var task = new Task(project, "Query targets in project directories", Task.Type.SYNC, scope.getTask());
-                    var newScope = new ToolWindowScope.Builder(project, task)
-                        .setProgressIndicator(indicator)
-                        .setPopupBehavior(BlazeUserSettings.FocusBehavior.ON_ERROR)
-                        .setIssueParsers(targetDetectionQueryParsers(project, WorkspaceRoot.fromProject(project)))
-                        .build();
-                    childContext.push(newScope);
-                  }
-                  // We don't want blaze build errors to fail the whole sync
-                  childContext.setPropagatesErrors(false);
-                  return DirectoryToTargetProvider.expandDirectoryTargets(
-                      project, shouldSyncManualTargets(projectViewSet), importRoots, pathResolver, childContext);
-                })).get(); // We still call no-timeout waitFor in ExternalTask.run()
+        ProgressiveTaskWithProgressIndicator.builder(project, title)
+            .setModality(BuildViewMigration.progressModality())
+            .submitTaskWithResult(indicator ->
+                Scope.push(
+                    context,
+                    childContext -> {
+                      childContext.push(
+                          new TimingScope("QueryDirectoryTargets", EventType.BlazeInvocation));
+                      childContext.output(new StatusOutput("Querying targets in project directories..."));
+                      var scope = childContext.getScope(ToolWindowScope.class);
+                      if (scope != null) { // If ToolWindowScope doesn't already exist, it means the output is not supposed to be printed to toolwindow (for example in tests)
+                        var task = new Task(project, "Query targets in project directories", Task.Type.SYNC, scope.getTask());
+                        var newScope = new ToolWindowScope.Builder(project, task)
+                            .setProgressIndicator(indicator)
+                            .setPopupBehavior(BlazeUserSettings.FocusBehavior.ON_ERROR)
+                            .setIssueParsers(targetDetectionQueryParsers(project, WorkspaceRoot.fromProject(project)))
+                            .build();
+                        childContext.push(newScope);
+                      }
+                      // We don't want blaze build errors to fail the whole sync
+                      childContext.setPropagatesErrors(false);
+                      return DirectoryToTargetProvider.expandDirectoryTargets(
+                          project, shouldSyncManualTargets(projectViewSet), importRoots, pathResolver, childContext);
+                    })).get(); // We still call no-timeout waitFor in ExternalTask.run()
     if (context.isCancelled()) {
       throw new SyncCanceledException();
     }
diff --git a/base/src/com/google/idea/blaze/base/sync/data/AspectSyncProjectDataManager.java b/base/src/com/google/idea/blaze/base/sync/data/AspectSyncProjectDataManager.java
index 02fafb7d5ed..86659c93239 100644
--- a/base/src/com/google/idea/blaze/base/sync/data/AspectSyncProjectDataManager.java
+++ b/base/src/com/google/idea/blaze/base/sync/data/AspectSyncProjectDataManager.java
@@ -19,6 +19,7 @@
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.idea.blaze.base.async.executor.ProgressiveTaskWithProgressIndicator;
+import com.google.idea.blaze.base.buildview.BuildViewMigration;
 import com.google.idea.blaze.base.io.FileOperationProvider;
 import com.google.idea.blaze.base.logging.EventLoggingService;
 import com.google.idea.blaze.base.model.AspectSyncProjectData;
@@ -92,6 +93,7 @@ public void saveProject(
     Future<?> unused =
         ProgressiveTaskWithProgressIndicator.builder(project, "Saving sync data...")
             .setExecutor(writeDataExecutor)
+            .setModality(BuildViewMigration.progressModality())
             .submitTask(
                 (ProgressIndicator indicator) -> {
                   try {

From 1b2c6e4da26317c0bfc6b27cdf92b02b353c7ab7 Mon Sep 17 00:00:00 2001
From: Daniel Brauner <daniel.brauner@jetbrains.com>
Date: Thu, 19 Sep 2024 18:20:38 +0200
Subject: [PATCH 05/17] added event parser

---
 base/src/META-INF/blaze-base.xml              |  4 +-
 .../base/buildview/events/AbortedParser.kt    | 75 +++++++++++++++++++
 .../buildview/events/ActionCompletedParser.kt | 66 ++++++++++++++++
 .../base/buildview/events/BazelBuildIssue.kt  | 38 ++++++++++
 .../base/buildview/events/BuildEventParser.kt |  3 +
 .../SuggestBuildShardingNotification.java     | 64 ++++++++--------
 6 files changed, 217 insertions(+), 33 deletions(-)
 create mode 100644 base/src/com/google/idea/blaze/base/buildview/events/AbortedParser.kt
 create mode 100644 base/src/com/google/idea/blaze/base/buildview/events/ActionCompletedParser.kt
 create mode 100644 base/src/com/google/idea/blaze/base/buildview/events/BazelBuildIssue.kt

diff --git a/base/src/META-INF/blaze-base.xml b/base/src/META-INF/blaze-base.xml
index bc4eaafc3d1..b019b7f77c1 100644
--- a/base/src/META-INF/blaze-base.xml
+++ b/base/src/META-INF/blaze-base.xml
@@ -684,7 +684,9 @@
     <ExperimentLoader implementation="com.google.idea.common.experiments.SystemPropertyExperimentLoader" order="first" id="SystemPropertyExperimentLoader"/>
     <ExperimentLoader implementation="com.google.idea.common.experiments.UserOverridesExperimentLoader" order="after SystemPropertyExperimentLoader" id="UserOverridesExperimentLoader"/>
     <ExperimentLoader implementation="com.google.idea.common.experiments.DefaultValuesExperimentLoader" order="last" id="DefaultValuesExperimentLoader"/>
-    <BlazeGuard implementation="com.google.idea.blaze.base.execution.TrustedProjectGuard"/> 
+    <BlazeGuard implementation="com.google.idea.blaze.base.execution.TrustedProjectGuard"/>
+    <BuildEventParser implementation="com.google.idea.blaze.base.buildview.events.AbortedParser"/>
+    <BuildEventParser implementation="com.google.idea.blaze.base.buildview.events.ActionCompletedParser"/>
   </extensions>
 
   <extensions defaultExtensionNs="com.google.idea.blaze.qsync">
diff --git a/base/src/com/google/idea/blaze/base/buildview/events/AbortedParser.kt b/base/src/com/google/idea/blaze/base/buildview/events/AbortedParser.kt
new file mode 100644
index 00000000000..f2250fc29e0
--- /dev/null
+++ b/base/src/com/google/idea/blaze/base/buildview/events/AbortedParser.kt
@@ -0,0 +1,75 @@
+package com.google.idea.blaze.base.buildview.events
+
+import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.BuildEvent
+import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.BuildEventId
+import com.google.idea.blaze.base.scope.output.IssueOutput
+import com.intellij.build.events.MessageEvent
+
+private fun <T> reportMissingImplementation(id: BuildEventId): T? {
+  LOG.error("missing implementation: $id")
+  return null
+}
+
+class AbortedParser : BuildEventParser {
+  private fun getDescription(id: BuildEventId): String? {
+    return when {
+      id.hasUnconfiguredLabel() -> "could not find label: ${id.unconfiguredLabel.label} - make sure a label or a file with that name exists"
+      id.hasTargetConfigured() -> "could not configure target: ${id.targetConfigured.label}"
+      id.hasTargetCompleted() -> "could not complete target: ${id.targetCompleted.label}"
+      id.hasConfiguredLabel() -> null
+      else -> reportMissingImplementation(id)
+    }
+  }
+
+  private fun getChildDescription(id: BuildEventId): String? {
+    return when {
+      id.hasUnconfiguredLabel() -> "depends on undefined label: ${id.unconfiguredLabel.label} - might not be a direct dependency"
+      id.hasConfiguredLabel() -> null
+      else -> reportMissingImplementation(id)
+    }
+  }
+
+  private fun buildDescription(event: BuildEvent): String? {
+    val builder = StringBuilder()
+
+    if (event.aborted.description.isNotBlank()) {
+      builder.append(event.aborted.description)
+    } else {
+      builder.append(getDescription(event.id) ?: return null)
+    }
+    builder.append("\n\n")
+
+    for (child in event.childrenList) {
+      val description = getChildDescription(child) ?: return null
+
+      builder.append(description)
+      builder.append("\n")
+    }
+
+    return builder.toString().trimEnd()
+  }
+
+  private fun getLabel(id: BuildEventId): String? {
+    return when {
+      id.hasTargetConfigured() -> id.targetConfigured.label
+      id.hasTargetCompleted() -> id.targetCompleted.label
+      id.hasUnconfiguredLabel() -> id.unconfiguredLabel.label
+      id.hasConfiguredLabel() -> id.configuredLabel.label
+      id.hasUnstructuredCommandLine() -> null
+      else -> reportMissingImplementation(id)
+    }
+  }
+
+  override fun parse(event: BuildEvent): IssueOutput? {
+    if (!event.hasAborted()) return null
+
+    val label = getLabel(event.id) ?: return null
+    val issue = BazelBuildIssue(
+      label = label,
+      title = "${event.aborted.reason}: $label",
+      description = buildDescription(event) ?: return null,
+    )
+
+    return IssueOutput(issue, MessageEvent.Kind.ERROR)
+  }
+}
\ No newline at end of file
diff --git a/base/src/com/google/idea/blaze/base/buildview/events/ActionCompletedParser.kt b/base/src/com/google/idea/blaze/base/buildview/events/ActionCompletedParser.kt
new file mode 100644
index 00000000000..f73e0affa24
--- /dev/null
+++ b/base/src/com/google/idea/blaze/base/buildview/events/ActionCompletedParser.kt
@@ -0,0 +1,66 @@
+package com.google.idea.blaze.base.buildview.events
+
+import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.*
+import com.google.idea.blaze.base.scope.output.IssueOutput
+import com.intellij.build.events.MessageEvent
+import java.io.IOException
+import java.net.URI
+import java.nio.file.Files
+import java.nio.file.Path
+
+class ActionCompletedParser : BuildEventParser {
+  private fun getDescription(body: ActionExecuted): String? {
+    if (!body.hasStderr()) {
+      if (body.hasFailureDetail()) {
+        return body.failureDetail.message
+      }
+
+      return null
+    }
+
+    val uri = try {
+      URI.create(body.stderr.uri)
+    } catch (e: IllegalArgumentException) {
+      return "Invalid output URI: ${body.stderr.uri}"
+    }
+
+    return try {
+      Files.readString(Path.of(uri))
+    } catch (e: IOException) {
+      "Could not read output file: ${e.message}"
+    }
+  }
+
+  override fun parse(event: BuildEvent): IssueOutput? {
+    if (!event.id.hasActionCompleted()) return null
+    val id = event.id.actionCompleted
+
+    val isExternal = !id.label.startsWith("//")
+
+    if (!event.hasAction()) return null
+    val body = event.action
+
+    val isWarning = !body.hasFailureDetail()
+
+    // ignore warnings from external projects
+    if (isExternal && isWarning) return null
+
+    val name = if (isWarning) {
+      "BUILD_WARNING"
+    } else {
+      "BUILD_FAILURE"
+    }
+
+    val issue = BazelBuildIssue(
+      label = id.label,
+      title = "$name: ${id.label}",
+      description = getDescription(body) ?: return null,
+    )
+
+    // TODO: if this is reused for a build view, this logic needs to be adjusted
+    return IssueOutput(
+      issue,
+      if (isWarning) MessageEvent.Kind.INFO else MessageEvent.Kind.WARNING,
+    )
+  }
+}
diff --git a/base/src/com/google/idea/blaze/base/buildview/events/BazelBuildIssue.kt b/base/src/com/google/idea/blaze/base/buildview/events/BazelBuildIssue.kt
new file mode 100644
index 00000000000..8c4b4ae4ce9
--- /dev/null
+++ b/base/src/com/google/idea/blaze/base/buildview/events/BazelBuildIssue.kt
@@ -0,0 +1,38 @@
+@file:Suppress("UnstableApiUsage")
+
+package com.google.idea.blaze.base.buildview.events
+
+import com.google.idea.blaze.base.lang.buildfile.references.BuildReferenceManager
+import com.google.idea.blaze.base.lang.buildfile.references.LabelUtils
+import com.intellij.build.issue.BuildIssue
+import com.intellij.build.issue.BuildIssueQuickFix
+import com.intellij.openapi.fileEditor.OpenFileDescriptor
+import com.intellij.openapi.project.Project
+import com.intellij.pom.Navigatable
+import com.intellij.pom.NavigatableAdapter
+import com.intellij.psi.util.startOffset
+
+data class BazelBuildIssue(
+  override val title: String,
+  override val description: String,
+  override val quickFixes: List<BuildIssueQuickFix> = emptyList(),
+  val label: String? = null,
+) : BuildIssue {
+
+  inner class LabelNavigatable(private val project: Project) : NavigatableAdapter() {
+    override fun navigate(requestFocus: Boolean) {
+      // TODO: better use `bazel query "label" --output=location` - would be way more accurate ??
+
+      val label = LabelUtils.createLabelFromString(null, label) ?: return
+      val element = BuildReferenceManager.getInstance(project).resolveLabel(label) ?: return
+
+      val file = element.containingFile.virtualFile ?: return
+      OpenFileDescriptor(project, file, element.startOffset).navigate(requestFocus)
+    }
+  }
+
+  override fun getNavigatable(project: Project): Navigatable? {
+    if (label == null) return null
+    return LabelNavigatable(project)
+  }
+}
\ No newline at end of file
diff --git a/base/src/com/google/idea/blaze/base/buildview/events/BuildEventParser.kt b/base/src/com/google/idea/blaze/base/buildview/events/BuildEventParser.kt
index c4091de64c1..79b0466f248 100644
--- a/base/src/com/google/idea/blaze/base/buildview/events/BuildEventParser.kt
+++ b/base/src/com/google/idea/blaze/base/buildview/events/BuildEventParser.kt
@@ -2,8 +2,11 @@ package com.google.idea.blaze.base.buildview.events
 
 import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.BuildEvent
 import com.google.idea.blaze.base.scope.output.IssueOutput
+import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.extensions.ExtensionPointName
 
+internal val LOG = Logger.getInstance(BuildEventParser::class.java)
+
 interface BuildEventParser {
   companion object {
     val EP_NAME: ExtensionPointName<BuildEventParser> =
diff --git a/base/src/com/google/idea/blaze/base/sync/sharding/SuggestBuildShardingNotification.java b/base/src/com/google/idea/blaze/base/sync/sharding/SuggestBuildShardingNotification.java
index 23ff654a893..67cc59f49c1 100644
--- a/base/src/com/google/idea/blaze/base/sync/sharding/SuggestBuildShardingNotification.java
+++ b/base/src/com/google/idea/blaze/base/sync/sharding/SuggestBuildShardingNotification.java
@@ -22,20 +22,21 @@
 import com.google.idea.blaze.base.scope.BlazeContext;
 import com.google.idea.blaze.base.scope.output.IssueOutput;
 import com.google.idea.blaze.base.settings.Blaze;
-import com.google.idea.blaze.base.settings.BuildSystemName;
 import com.google.idea.blaze.base.settings.ui.OpenProjectViewAction;
 import com.google.idea.blaze.base.sync.BlazeSyncManager;
+import com.intellij.build.issue.BuildIssueQuickFix;
 import com.intellij.notification.Notification;
 import com.intellij.notification.NotificationListener;
 import com.intellij.notification.NotificationType;
+import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Messages;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.pom.NavigatableAdapter;
 import com.intellij.util.Consumer;
 import com.intellij.xml.util.XmlStringUtil;
+import java.util.concurrent.CompletableFuture;
 import javax.swing.event.HyperlinkEvent;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * If blaze runs out of memory during sync, suggest that the user enables build sharding, or tweaks
@@ -53,41 +54,40 @@ public static void syncOutOfMemoryError(Project project, BlazeContext context) {
   }
 
   private static void suggestIncreasingServerMemory(Project project, BlazeContext context) {
-    BuildSystemName buildSystemName = Blaze.getBuildSystemName(project);
-    String message =
-        String.format(
-            "The %s server ran out of memory during sync. You can work around this by "
-                + "allocating more memory to the %s server, for example by adding this line to "
-                + "your %s:<br>"
-                + "startup --host_jvm_args=-Xmx15g --host_jvm_args=-Xms15g",
-            buildSystemName.getName(),
-            buildSystemName.getName(),
-            buildSystemName == BuildSystemName.Bazel ? ".bazelrc" : "~/.blazerc");
+    final var title = "The Bazel server ran out of memory during sync";
+    final var description = "You can work around this by allocating more memory to the Bazel server, "
+        + "for example by adding this line to your .bazelrc file:\nstartup --host_jvm_args=-Xmx15g --host_jvm_args=-Xms15g";
 
-    IssueOutput.error(StringUtil.stripHtml(message, true)).submit(context);
-
-    showNotification(project, message, p -> {});
+    IssueOutput.error(title).withDescription(description).submit(context);
+    showNotification(project, String.format("%s. %s", title, description), p -> {});
   }
 
   private static void suggestSharding(Project project, BlazeContext context) {
-    String buildSystem = Blaze.buildSystemName(project);
-    String message =
-        String.format(
-            "The %1$s server ran out of memory during sync. This can occur for large projects. You "
-                + "can work around this by sharding the %1$s build during sync "
-                + "<a href='fix'>(click here)</a>, "
-                + "or alternatively allocate more memory to %1$s",
-            buildSystem);
-    IssueOutput.error(StringUtil.stripHtml(message, true) + ". Click here to set up sync sharding.")
-        .navigatable(
-            new NavigatableAdapter() {
-              @Override
-              public void navigate(boolean requestFocus) {
-                enableShardingAndResync(project);
-              }
-            })
+    final var title = "The Bazel server ran out of memory during sync";
+    final var description = "This can occur for large projects. You can work around this by sharding the Bazel build "
+        + "during sync or alternatively allocate more memory to Bazel.";
+
+    final var fix = new BuildIssueQuickFix() {
+      @NotNull
+      @Override
+      public String getId() {
+        return "bazel.sync.enable.sharding";
+      }
+
+      @NotNull
+      @Override
+      public CompletableFuture<?> runQuickFix(@NotNull Project project, @NotNull DataContext dataContext) {
+        enableShardingAndResync(project);
+        return CompletableFuture.completedFuture(null);
+      }
+    };
+
+    IssueOutput.error(title)
+        .withDescription(description)
+        .withFix("Enable sharding and retry sync", fix)
         .submit(context);
 
+    final var message = String.format("%s. %s  Click <a href='fix'>here</a> to set up sync sharding.", title, description);
     showNotification(project, message, SuggestBuildShardingNotification::enableShardingAndResync);
   }
 

From 27a746068f4c2a5cd5fb69105866eb42f573c286 Mon Sep 17 00:00:00 2001
From: Daniel Brauner <daniel.brauner@jetbrains.com>
Date: Sat, 21 Sep 2024 17:00:52 +0200
Subject: [PATCH 06/17] Rename .java to .kt

---
 .../buildresult/{BuildResultHelper.java => BuildResultHelper.kt}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename base/src/com/google/idea/blaze/base/command/buildresult/{BuildResultHelper.java => BuildResultHelper.kt} (100%)

diff --git a/base/src/com/google/idea/blaze/base/command/buildresult/BuildResultHelper.java b/base/src/com/google/idea/blaze/base/command/buildresult/BuildResultHelper.kt
similarity index 100%
rename from base/src/com/google/idea/blaze/base/command/buildresult/BuildResultHelper.java
rename to base/src/com/google/idea/blaze/base/command/buildresult/BuildResultHelper.kt

From 2a40b7a4d6a653641356e4acfb9bb94a65bbbd5a Mon Sep 17 00:00:00 2001
From: Daniel Brauner <daniel.brauner@jetbrains.com>
Date: Sat, 21 Sep 2024 17:00:52 +0200
Subject: [PATCH 07/17] added bazel build service

# Conflicts:
#	base/src/com/google/idea/blaze/base/sync/aspects/BlazeIdeInterfaceAspectsImpl.java
---
 .../BlazeApkDeployInfoProtoHelper.java        |   8 +-
 .../run/test/BlazeAndroidTestLaunchTask.java  |   9 +-
 base/src/META-INF/blaze-base.xml              |   1 -
 .../base/bazel/AbstractBuildInvoker.java      |   3 +-
 .../blaze/base/bazel/BazelBuildSystem.java    |   9 -
 .../idea/blaze/base/buildview/BazelService.kt | 139 +++++++++++
 .../idea/blaze/base/buildview/ContextExt.kt   |  16 +-
 .../CommandLineBlazeCommandRunner.java        |  19 +-
 .../buildresult/BuildEventProtocolUtils.java  |   8 +-
 .../command/buildresult/BuildResultHelper.kt  | 232 ++++++------------
 .../buildresult/BuildResultHelperBep.java     | 113 ---------
 .../BuildResultHelperProvider.java            |  65 -----
 ...lBuildEventProtocolTestFinderStrategy.java |   2 +-
 .../aspects/BlazeIdeInterfaceAspectsImpl.java |   6 +-
 ...ldEventProtocolTestFinderStrategyTest.java |   1 -
 .../run/BlazeCidrRunConfigurationRunner.java  |   4 +-
 .../run/BlazePyRunConfigurationRunner.java    |   4 +-
 17 files changed, 245 insertions(+), 394 deletions(-)
 create mode 100644 base/src/com/google/idea/blaze/base/buildview/BazelService.kt
 delete mode 100644 base/src/com/google/idea/blaze/base/command/buildresult/BuildResultHelperBep.java
 delete mode 100644 base/src/com/google/idea/blaze/base/command/buildresult/BuildResultHelperProvider.java

diff --git a/aswb/src/com/google/idea/blaze/android/run/deployinfo/BlazeApkDeployInfoProtoHelper.java b/aswb/src/com/google/idea/blaze/android/run/deployinfo/BlazeApkDeployInfoProtoHelper.java
index 88c62b3ee64..f4bbf2162f2 100644
--- a/aswb/src/com/google/idea/blaze/android/run/deployinfo/BlazeApkDeployInfoProtoHelper.java
+++ b/aswb/src/com/google/idea/blaze/android/run/deployinfo/BlazeApkDeployInfoProtoHelper.java
@@ -17,6 +17,7 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
 import com.google.devtools.build.lib.rules.android.deployinfo.AndroidDeployInfoOuterClass.AndroidDeployInfo;
 import com.google.devtools.build.lib.rules.android.deployinfo.AndroidDeployInfoOuterClass.Artifact;
 import com.google.idea.blaze.android.manifest.ManifestParser.ParsedManifest;
@@ -29,6 +30,7 @@
 import com.google.idea.blaze.common.artifact.OutputArtifact;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
+import com.intellij.util.containers.ContainerUtil;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -45,7 +47,7 @@ public class BlazeApkDeployInfoProtoHelper {
   public AndroidDeployInfo readDeployInfoProtoForTarget(
       Label target, BuildResultHelper buildResultHelper, Predicate<String> pathFilter)
       throws GetDeployInfoException {
-    ImmutableList<OutputArtifact> outputArtifacts;
+    ImmutableSet<OutputArtifact> outputArtifacts;
     try {
       outputArtifacts = buildResultHelper.getBuildArtifactsForTarget(target, pathFilter);
     } catch (GetArtifactsException e) {
@@ -62,7 +64,7 @@ public AndroidDeployInfo readDeployInfoProtoForTarget(
           log.warn(outputArtifact.getRelativePath() + " -> " + outputArtifact.getRelativePath());
         }
         log.warn("All local artifacts for " + target + ":");
-        List<OutputArtifact> allBuildArtifacts =
+        ImmutableSet<OutputArtifact> allBuildArtifacts =
             buildResultHelper.getBuildArtifactsForTarget(target, path -> true);
         List<File> allLocalFiles = LocalFileArtifact.getLocalFiles(allBuildArtifacts);
         for (File file : allLocalFiles) {
@@ -87,7 +89,7 @@ public AndroidDeployInfo readDeployInfoProtoForTarget(
                   .collect(Collectors.joining(", ", "[", "]")));
     }
 
-    try (InputStream inputStream = outputArtifacts.get(0).getInputStream()) {
+    try (InputStream inputStream = ContainerUtil.getFirstItem(outputArtifacts).getInputStream()) {
       return AndroidDeployInfo.parseFrom(inputStream);
     } catch (IOException e) {
       throw new GetDeployInfoException(e.getMessage());
diff --git a/aswb/src/com/google/idea/blaze/android/run/test/BlazeAndroidTestLaunchTask.java b/aswb/src/com/google/idea/blaze/android/run/test/BlazeAndroidTestLaunchTask.java
index d057bc54172..f505e849402 100644
--- a/aswb/src/com/google/idea/blaze/android/run/test/BlazeAndroidTestLaunchTask.java
+++ b/aswb/src/com/google/idea/blaze/android/run/test/BlazeAndroidTestLaunchTask.java
@@ -26,8 +26,6 @@
 import com.google.idea.blaze.base.command.BlazeCommandName;
 import com.google.idea.blaze.base.command.BlazeFlags;
 import com.google.idea.blaze.base.command.buildresult.BuildResultHelper;
-import com.google.idea.blaze.base.command.buildresult.BuildResultHelper.GetArtifactsException;
-import com.google.idea.blaze.base.command.buildresult.BuildResultHelperBep;
 import com.google.idea.blaze.base.filecache.FileCaches;
 import com.google.idea.blaze.base.ideinfo.AndroidInstrumentationInfo;
 import com.google.idea.blaze.base.ideinfo.TargetIdeInfo;
@@ -195,7 +193,7 @@ public void run(@NotNull BlazeLaunchContext launchContext)
                           String.format("Starting %s test...\n", Blaze.buildSystemName(project)));
 
                       int retVal;
-                      try (BuildResultHelper buildResultHelper = new BuildResultHelperBep()) {
+                      try (final var buildResultHelper = new BuildResultHelper()) {
                         commandBuilder.addBlazeFlags(buildResultHelper.getBuildFlags());
                         BlazeCommand command = commandBuilder.build();
                         ExecutionUtils.println(console, command + "\n");
@@ -212,16 +210,13 @@ public void run(@NotNull BlazeLaunchContext launchContext)
                         if (retVal != 0) {
                           context.setHasError();
                         } else {
-                          testResultsHolder.setTestResults(
-                              buildResultHelper.getTestResults(Optional.empty()));
+                          testResultsHolder.setTestResults(buildResultHelper.getTestResults());
                         }
                         ListenableFuture<Void> unusedFuture =
                             FileCaches.refresh(
                                 project,
                                 context,
                                 BlazeBuildOutputs.noOutputs(BuildResult.fromExitCode(retVal)));
-                      } catch (GetArtifactsException e) {
-                        LOG.error(e.getMessage());
                       }
                       return !context.hasErrors();
                     }));
diff --git a/base/src/META-INF/blaze-base.xml b/base/src/META-INF/blaze-base.xml
index b019b7f77c1..f334fc5a205 100644
--- a/base/src/META-INF/blaze-base.xml
+++ b/base/src/META-INF/blaze-base.xml
@@ -616,7 +616,6 @@
     <VcsHandler implementation="com.google.idea.blaze.base.vcs.FallbackBlazeVcsHandlerProvider" order="last" id="fallback"/>
     <BuildSystemProvider implementation="com.google.idea.blaze.base.bazel.BazelBuildSystemProvider" id="BazelBuildSystemProvider" order="last"/>
     <BuildifierBinaryProvider implementation="com.google.idea.blaze.base.buildmodifier.DefaultBuildifierBinaryProvider"/>
-    <BuildResultHelperProvider order="last" implementation="com.google.idea.blaze.base.command.buildresult.BuildResultHelperBep$Provider"/>
     <BlazeCommandRunConfigurationHandlerProvider implementation="com.google.idea.blaze.base.run.confighandler.PendingTargetRunConfigurationHandlerProvider"/>
     <BlazeCommandRunConfigurationHandlerProvider implementation="com.google.idea.blaze.base.run.confighandler.BlazeCommandGenericRunConfigurationHandlerProvider" order="last"/>
     <AttributeSpecificStringLiteralReferenceProvider implementation="com.google.idea.blaze.base.lang.buildfile.references.VisibilityReferenceProvider"/>
diff --git a/base/src/com/google/idea/blaze/base/bazel/AbstractBuildInvoker.java b/base/src/com/google/idea/blaze/base/bazel/AbstractBuildInvoker.java
index 5e76138a86c..52b9900d82c 100644
--- a/base/src/com/google/idea/blaze/base/bazel/AbstractBuildInvoker.java
+++ b/base/src/com/google/idea/blaze/base/bazel/AbstractBuildInvoker.java
@@ -26,7 +26,6 @@
 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;
-import com.google.idea.blaze.base.command.buildresult.BuildResultHelperBep;
 import com.google.idea.blaze.base.command.info.BlazeInfo;
 import com.google.idea.blaze.base.command.info.BlazeInfoProvider;
 import com.google.idea.blaze.base.command.info.BlazeInfoRunner;
@@ -95,7 +94,7 @@ public boolean supportsParallelism() {
   @Override
   @MustBeClosed
   public BuildResultHelper createBuildResultHelper() {
-    return new BuildResultHelperBep();
+    return new BuildResultHelper();
   }
 
   @Override
diff --git a/base/src/com/google/idea/blaze/base/bazel/BazelBuildSystem.java b/base/src/com/google/idea/blaze/base/bazel/BazelBuildSystem.java
index 1fa124ce963..87d78f74eb4 100644
--- a/base/src/com/google/idea/blaze/base/bazel/BazelBuildSystem.java
+++ b/base/src/com/google/idea/blaze/base/bazel/BazelBuildSystem.java
@@ -15,11 +15,8 @@
  */
 package com.google.idea.blaze.base.bazel;
 
-import com.google.errorprone.annotations.MustBeClosed;
 import com.google.idea.blaze.base.command.BlazeCommandName;
 import com.google.idea.blaze.base.command.CommandLineBlazeCommandRunner;
-import com.google.idea.blaze.base.command.buildresult.BuildResultHelper;
-import com.google.idea.blaze.base.command.buildresult.BuildResultHelperBep;
 import com.google.idea.blaze.base.command.info.BlazeInfo;
 import com.google.idea.blaze.base.model.BlazeVersionData;
 import com.google.idea.blaze.base.model.primitives.Kind;
@@ -52,12 +49,6 @@ public BazelInvoker(Project project, BlazeContext blazeContext, String path) {
           BazelBuildSystem.this,
           new CommandLineBlazeCommandRunner());
     }
-
-    @Override
-    @MustBeClosed
-    public BuildResultHelper createBuildResultHelper() {
-      return new BuildResultHelperBep();
-    }
   }
 
   @Override
diff --git a/base/src/com/google/idea/blaze/base/buildview/BazelService.kt b/base/src/com/google/idea/blaze/base/buildview/BazelService.kt
new file mode 100644
index 00000000000..4caeb61932e
--- /dev/null
+++ b/base/src/com/google/idea/blaze/base/buildview/BazelService.kt
@@ -0,0 +1,139 @@
+package com.google.idea.blaze.base.buildview
+
+import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.BuildEvent
+import com.google.idea.blaze.base.buildview.events.BuildEventParser
+import com.google.idea.blaze.base.command.BlazeCommand
+import com.google.idea.blaze.base.command.BlazeCommandName
+import com.google.idea.blaze.base.command.buildresult.BuildResultHelper
+import com.google.idea.blaze.base.model.primitives.WorkspaceRoot
+import com.google.idea.blaze.base.scope.BlazeContext
+import com.google.idea.blaze.base.sync.aspects.BlazeBuildOutputs
+import com.google.idea.blaze.base.sync.aspects.BuildResult
+import com.intellij.execution.configurations.GeneralCommandLine
+import com.intellij.execution.process.OSProcessHandler
+import com.intellij.execution.process.ProcessEvent
+import com.intellij.execution.process.ProcessListener
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.components.Service
+import com.intellij.openapi.components.service
+import com.intellij.openapi.diagnostic.Logger
+import com.intellij.openapi.diagnostic.thisLogger
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.util.Key
+import com.intellij.util.ui.EDT
+import kotlinx.coroutines.*
+import java.io.FileInputStream
+import java.io.IOException
+
+@Service(Service.Level.PROJECT)
+class BazelService(private val project: Project, private val scope: CoroutineScope) {
+  companion object {
+    private val LOG: Logger = thisLogger()
+
+    @JvmStatic
+    fun instance(project: Project): BazelService = project.service()
+  }
+
+  private fun assertNonBlocking() {
+    LOG.assertTrue(
+      !EDT.isCurrentThreadEdt(),
+      "action would block UI thread",
+    )
+    LOG.assertTrue(
+      !ApplicationManager.getApplication().isReadAccessAllowed,
+      "action holds read lock, can block UI thread"
+    )
+  }
+
+  private fun <T> executionScope(
+    ctx: BlazeContext,
+    block: suspend CoroutineScope.(BuildResultHelper) -> T
+  ): T {
+    return ctx.pushJob(scope) {
+      BuildResultHelper().use { block(it) }
+    }
+  }
+
+  private suspend fun execute(ctx: BlazeContext, cmd: BlazeCommand): Int {
+    val root = cmd.effectiveWorkspaceRoot.orElseGet { WorkspaceRoot.fromProject(project).path() }
+
+    val handler = GeneralCommandLine()
+      .withExePath(cmd.binaryPath)
+      .withParameters(cmd.toArgumentList())
+      .withWorkingDirectory(root)
+      .withRedirectErrorStream(true)
+      .let(::OSProcessHandler)
+
+    handler.addProcessListener(object : ProcessListener {
+      override fun onTextAvailable(event: ProcessEvent, outputType: Key<*>) {
+        ctx.println(event.text.trimEnd())
+      }
+    })
+    handler.startNotify()
+
+    try {
+      while (!handler.isProcessTerminated) delay(100)
+    } finally {
+      handler.destroyProcess()
+    }
+
+    val exitCode = handler.exitCode ?: 1
+    if (exitCode != 0) {
+      ctx.setHasError()
+    }
+
+    return exitCode
+  }
+
+  private fun CoroutineScope.parseEvents(ctx: BlazeContext, helper: BuildResultHelper): Job {
+    val handler = CoroutineExceptionHandler { _, e -> LOG.error("error in event parser", e) }
+
+    return launch(handler + CoroutineName("EventParser")) {
+      // wait for bazel to create the output file
+      while (!helper.outputFile.exists()) delay(10)
+
+      FileInputStream(helper.outputFile).use { stream ->
+
+        // keep reading events while the coroutine is active i.e. bazel is still running
+        // or while the stream has data available (to ensure that all events are processed)
+        while (isActive || stream.available() > 0) {
+          val event = try {
+            BuildEvent.parseDelimitedFrom(stream)
+          } catch (e: IOException) {
+            LOG.error("could not parse event", e)
+            continue
+          }
+
+          if (event == null) {
+            delay(10)
+          } else {
+            BuildEventParser.parse(event)?.let(ctx::output)
+          }
+        }
+      }
+    }
+  }
+
+  fun build(ctx: BlazeContext, cmdBuilder: BlazeCommand.Builder): BlazeBuildOutputs {
+    assertNonBlocking()
+    LOG.assertTrue(cmdBuilder.name == BlazeCommandName.BUILD)
+
+    return executionScope(ctx) { provider ->
+      cmdBuilder.addBlazeFlags(provider.getBuildFlags())
+
+      val parseJob = parseEvents(ctx, provider)
+
+      val exitCode = execute(ctx, cmdBuilder.build())
+      val result = BuildResult.fromExitCode(exitCode)
+
+      parseJob.cancelAndJoin()
+
+      if (result.status != BuildResult.Status.SUCCESS) {
+        BlazeBuildOutputs.noOutputs(result)
+      } else {
+        BlazeBuildOutputs.fromParsedBepOutput(result, provider.getBuildOutput())
+      }
+    }
+  }
+}
+
diff --git a/base/src/com/google/idea/blaze/base/buildview/ContextExt.kt b/base/src/com/google/idea/blaze/base/buildview/ContextExt.kt
index 550affb194a..a5d615348c1 100644
--- a/base/src/com/google/idea/blaze/base/buildview/ContextExt.kt
+++ b/base/src/com/google/idea/blaze/base/buildview/ContextExt.kt
@@ -1,9 +1,9 @@
 package com.google.idea.blaze.base.buildview
 
 import com.google.idea.blaze.base.scope.BlazeContext
-import com.google.idea.blaze.base.scope.BlazeScope
 import com.google.idea.blaze.common.PrintOutput
 import com.intellij.openapi.progress.runBlockingMaybeCancellable
+import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
@@ -12,14 +12,14 @@ fun BlazeContext.println(msg: String) {
   output(PrintOutput(msg))
 }
 
-fun <T> BlazeContext.pushJob(scope: CoroutineScope, block: suspend CoroutineScope.() -> T): T {
-  val deferred = scope.async(Dispatchers.IO) { block() }
+fun <T> BlazeContext.pushJob(
+  scope: CoroutineScope,
+  name: String = "BazelContext",
+  block: suspend CoroutineScope.() -> T,
+): T {
+  val deferred = scope.async(Dispatchers.IO + CoroutineName(name)) { block() }
 
-  push(object : BlazeScope {
-    override fun onScopeEnd(context: BlazeContext?) {
-      deferred.cancel()
-    }
-  })
+  addCancellationHandler { deferred.cancel() }
 
   return runBlockingMaybeCancellable {
     deferred.await()
diff --git a/base/src/com/google/idea/blaze/base/command/CommandLineBlazeCommandRunner.java b/base/src/com/google/idea/blaze/base/command/CommandLineBlazeCommandRunner.java
index d689fafd8cd..143dd3f253f 100644
--- a/base/src/com/google/idea/blaze/base/command/CommandLineBlazeCommandRunner.java
+++ b/base/src/com/google/idea/blaze/base/command/CommandLineBlazeCommandRunner.java
@@ -25,7 +25,6 @@
 import com.google.idea.blaze.base.bazel.BazelExitCodeException.ThrowOption;
 import com.google.idea.blaze.base.command.buildresult.BuildResultHelper;
 import com.google.idea.blaze.base.command.buildresult.BuildResultHelper.GetArtifactsException;
-import com.google.idea.blaze.base.command.buildresult.BuildResultHelperBep;
 import com.google.idea.blaze.base.command.buildresult.ParsedBepOutput;
 import com.google.idea.blaze.base.command.mod.BlazeModException;
 import com.google.idea.blaze.base.console.BlazeConsoleLineProcessorProvider;
@@ -88,17 +87,9 @@ public BlazeBuildOutputs run(
       context.setHasError();
     }
     context.output(SummaryOutput.output(SummaryOutput.Prefix.TIMESTAMP, "Build command finished. Retrieving BEP outputs ..."));
-    if (buildResultHelper instanceof BuildResultHelperBep) {
-      File outputFile = ((BuildResultHelperBep) buildResultHelper).getOutputFile();
-      context.output(SummaryOutput.output(SummaryOutput.Prefix.TIMESTAMP, String.format("BEP file '%s' (%d bytes)", outputFile.getAbsolutePath(), outputFile.length())));
-    }
     try {
-      Interner<String> stringInterner =
-          Optional.ofNullable(context.getScope(SharedStringPoolScope.class))
-              .map(SharedStringPoolScope::getStringInterner)
-              .orElse(null);
       context.output(SummaryOutput.output(SummaryOutput.Prefix.TIMESTAMP, "Parsing BEP outputs..."));
-      ParsedBepOutput buildOutput = buildResultHelper.getBuildOutput(stringInterner);
+      ParsedBepOutput buildOutput = buildResultHelper.getBuildOutput();
       context.output(SummaryOutput.output(SummaryOutput.Prefix.TIMESTAMP, "Handling parsed BEP outputs..."));
       BlazeBuildOutputs blazeBuildOutputs = BlazeBuildOutputs.fromParsedBepOutput(
           buildResult, buildOutput);
@@ -135,13 +126,7 @@ public BlazeTestResults runTest(
       return BlazeTestResults.NO_RESULTS;
     }
     context.output(PrintOutput.log("Build command finished. Retrieving BEP outputs..."));
-    try {
-      return buildResultHelper.getTestResults(Optional.empty());
-    } catch (GetArtifactsException e) {
-      context.output(PrintOutput.log("Failed to get build outputs: " + e.getMessage()));
-      context.setHasError();
-      return BlazeTestResults.NO_RESULTS;
-    }
+    return buildResultHelper.getTestResults();
   }
 
   @Override
diff --git a/base/src/com/google/idea/blaze/base/command/buildresult/BuildEventProtocolUtils.java b/base/src/com/google/idea/blaze/base/command/buildresult/BuildEventProtocolUtils.java
index 80af6c4aaf4..b3b41306792 100644
--- a/base/src/com/google/idea/blaze/base/command/buildresult/BuildEventProtocolUtils.java
+++ b/base/src/com/google/idea/blaze/base/command/buildresult/BuildEventProtocolUtils.java
@@ -28,6 +28,8 @@ public final class BuildEventProtocolUtils {
 
   // Instructs BEP to use local file paths (file://...) rather than objfs blobids.
   private static final String LOCAL_FILE_PATHS = "--nobuild_event_binary_file_path_conversion";
+  // Instructs BEP to emit events for all actions.
+  private static final String PUBLISH_ALL_ACTIONS = "--build_event_publish_all_actions";
   // A vm option overriding the directory used for the BEP output file.
   private static final String BEP_OUTPUT_FILE_VM_OVERRIDE = "bazel.bep.path";
 
@@ -55,7 +57,11 @@ public static File createTempOutputFile() {
 
   /** Returns a build flag instructing blaze to write build events to the given output file. */
   public static ImmutableList<String> getBuildFlags(File outputFile) {
-    return ImmutableList.of("--build_event_binary_file=" + outputFile.getPath(), LOCAL_FILE_PATHS);
+    return ImmutableList.of(
+        "--build_event_binary_file=" + outputFile.getPath(),
+        LOCAL_FILE_PATHS,
+        PUBLISH_ALL_ACTIONS
+    );
   }
 
   /**
diff --git a/base/src/com/google/idea/blaze/base/command/buildresult/BuildResultHelper.kt b/base/src/com/google/idea/blaze/base/command/buildresult/BuildResultHelper.kt
index 8e7a6cc95ee..8ce74d405a2 100644
--- a/base/src/com/google/idea/blaze/base/command/buildresult/BuildResultHelper.kt
+++ b/base/src/com/google/idea/blaze/base/command/buildresult/BuildResultHelper.kt
@@ -13,192 +13,110 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.idea.blaze.base.command.buildresult;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Interner;
-import com.google.idea.blaze.base.model.primitives.Label;
-import com.google.idea.blaze.base.run.testlogs.BlazeTestResults;
-import com.google.idea.blaze.base.scope.BlazeContext;
-import com.google.idea.blaze.common.artifact.OutputArtifact;
-import com.google.idea.blaze.exception.BuildException;
-import java.io.InputStream;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-
-/** Assists in getting build artifacts from a build operation. */
-public interface BuildResultHelper extends AutoCloseable {
+package com.google.idea.blaze.base.command.buildresult
+
+import com.google.common.collect.ImmutableSet
+import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.BuildEvent
+import com.google.idea.blaze.base.command.buildresult.BuildEventStreamProvider.BuildEventStreamException
+import com.google.idea.blaze.base.model.primitives.Label
+import com.google.idea.blaze.base.run.testlogs.BlazeTestResults
+import com.google.idea.blaze.common.artifact.OutputArtifact
+import com.google.idea.blaze.exception.BuildException
+import com.intellij.openapi.diagnostic.Logger
+import java.io.BufferedInputStream
+import java.io.File
+import java.io.FileInputStream
+import java.io.IOException
+import java.util.*
+import java.util.function.Predicate
+
+private val LOG = Logger.getInstance(BuildResultHelper::class.java)
+
+/**
+ * Build event protocol implementation to get build results.
+ *
+ * The build even protocol (BEP for short) is a proto-based protocol used by bazel to communicate
+ * build events.
+ */
+class BuildResultHelper : AutoCloseable {
+  val outputFile: File = BuildEventProtocolUtils.createTempOutputFile()
 
   /**
    * Returns the build flags necessary for the build result helper to work.
    *
    * <p>The user must add these flags to their build command.
    */
-  List<String> getBuildFlags();
-
-  /**
-   * Parses the BEP output data and returns the corresponding {@link ParsedBepOutput}. May only be
-   * called once, after the build is complete.
-   *
-   * <p>As BEP retrieval can be memory-intensive for large projects, implementations of
-   * getBuildOutput may restrict parallelism for cases in which many builds are executed in parallel
-   * (e.g. remote builds).
-   */
-  default ParsedBepOutput getBuildOutput() throws GetArtifactsException {
-    return getBuildOutput(Optional.empty());
-  }
-
-  /**
-   * Parses the BEP output data and returns the corresponding {@link ParsedBepOutput}. May only be
-   * called once, after the build is complete.
-   *
-   * <p>As BEP retrieval can be memory-intensive for large projects, implementations of
-   * getBuildOutput may restrict parallelism for cases in which many builds are executed in parallel
-   * (e.g. remote builds).
-   */
-  default ParsedBepOutput getBuildOutput(Interner<String> stringInterner)
-      throws GetArtifactsException {
-    return getBuildOutput(Optional.empty(), stringInterner);
-  }
-
-  /**
-   * Parses the BEP output data and returns the corresponding {@link ParsedBepOutput}. May only be
-   * called once, after the build is complete.
-   *
-   * <p>As BEP retrieval can be memory-intensive for large projects, implementations of
-   * getBuildOutput may restrict parallelism for cases in which many builds are executed in parallel
-   * (e.g. remote builds).
-   */
-  default ParsedBepOutput getBuildOutput(
-      Optional<String> completionBuildId, Interner<String> stringInterner)
-      throws GetArtifactsException {
-    return getBuildOutput(completionBuildId);
-  }
-
-  /**
-   * Retrieves BEP build events according to given id, parses them and returns the corresponding
-   * {@link ParsedBepOutput}. May only be called once, after the build is complete.
-   *
-   * <p>As BEP retrieval can be memory-intensive for large projects, implementations of
-   * getBuildOutput may restrict parallelism for cases in which many builds are executed in parallel
-   * (e.g. remote builds).
-   */
-  ParsedBepOutput getBuildOutput(Optional<String> completedBuildId) throws GetArtifactsException;
+  fun getBuildFlags(): List<String> = BuildEventProtocolUtils.getBuildFlags(outputFile)
 
   /**
-   * Retrieves test results, parses them and returns the corresponding {@link BlazeTestResults}. May
-   * only be called once, after the build is complete.
+   * Parses the BEP output data and returns the corresponding {@link ParsedBepOutput}.
    */
-  BlazeTestResults getTestResults(Optional<String> completedBuildId) throws GetArtifactsException;
-
-  /** Deletes the local BEP output file associated with the test results */
-  default void deleteTemporaryOutputFiles() {}
-
-  /**
-   * Parses the BEP output data to collect all build flags used. Return all flags that pass filters
-   */
-  BuildFlags getBlazeFlags(Optional<String> completedBuildId) throws GetFlagsException;
-
-  /**
-   * Parses the BEP output data to collect message on stdout.
-   *
-   * <p>This function is designed for remote build which does not have local console output. Local
-   * build should not use this since {@link ExternalTask} provide stdout handler.
-   *
-   * @param completedBuildId build id.
-   * @param stderrConsumer process stderr
-   * @param blazeContext blaze context may contains logging scope
-   * @return a list of message on stdout.
-   */
-  default InputStream getStdout(
-      String completedBuildId, Consumer<String> stderrConsumer, BlazeContext blazeContext)
-      throws BuildException {
-    return InputStream.nullInputStream();
+  @Throws(GetArtifactsException::class)
+  fun getBuildOutput(): ParsedBepOutput {
+    return try {
+      BufferedInputStream(FileInputStream(outputFile)).use(ParsedBepOutput::parseBepArtifacts)
+    } catch (e: IOException) {
+      LOG.error(e)
+      throw GetArtifactsException(e.message)
+    } catch (e: BuildEventStreamException) {
+      LOG.error(e)
+      throw GetArtifactsException(e.message)
+    }
   }
 
   /**
-   * Parses the BEP output data to collect message on stderr.
-   *
-   * <p>This function is designed for remote build which does not have local console output. Local
-   * build should not use this since {@link ExternalTask} provide stderr handler.
-   *
-   * @param completedBuildId build id.
-   * @return a list of message on stderr.
+   * Parses the BEP output data and returns the corresponding {@link ParsedBepOutput}.
    */
-  default InputStream getStderr(String completedBuildId) throws BuildException {
-    return InputStream.nullInputStream();
+  fun getTestResults(): BlazeTestResults {
+    return try {
+      BufferedInputStream(FileInputStream(outputFile)).use(BuildEventProtocolOutputReader::parseTestResults)
+    } catch (e: IOException) {
+      LOG.warn(e)
+      return BlazeTestResults.NO_RESULTS
+    } catch (e: BuildEventStreamException) {
+      LOG.warn(e)
+      return BlazeTestResults.NO_RESULTS
+    }
   }
 
-  /**
-   * Parses the BEP output data to collect all build flags used. Return all flags that pass filters
-   */
-  default BuildFlags getBlazeFlags() throws GetFlagsException {
-    return getBlazeFlags(Optional.empty());
+  fun deleteTemporaryOutputFiles() {
+    outputFile.delete()
   }
 
-  /**
-   * Returns the build result. May only be called once, after the build is complete, or no artifacts
-   * will be returned.
-   *
-   * @return The build artifacts from the build operation.
-   */
-  default ImmutableList<OutputArtifact> getAllOutputArtifacts(Predicate<String> pathFilter)
-      throws GetArtifactsException {
-    return getBuildOutput().getAllOutputArtifacts(pathFilter).asList();
+  @Throws(GetFlagsException::class)
+  fun getBlazeFlags(): BuildFlags {
+    return try {
+      BufferedInputStream(FileInputStream(outputFile)).use(BuildFlags::parseBep)
+    } catch (e: IOException) {
+      throw GetFlagsException(e)
+    } catch (e: BuildEventStreamException) {
+      throw GetFlagsException(e)
+    }
   }
 
   /**
    * Returns the build artifacts, filtering out all artifacts not directly produced by the specified
    * target.
-   *
-   * <p>May only be called once, after the build is complete, or no artifacts will be returned.
    */
-  default ImmutableList<OutputArtifact> getBuildArtifactsForTarget(
-      Label target, Predicate<String> pathFilter) throws GetArtifactsException {
-    return getBuildOutput().getDirectArtifactsForTarget(target, pathFilter).asList();
+  @Throws(GetArtifactsException::class)
+  fun getBuildArtifactsForTarget(
+    target: Label,
+    pathFilter: Predicate<String>,
+  ): ImmutableSet<OutputArtifact> {
+    return getBuildOutput().getDirectArtifactsForTarget(target, pathFilter)
   }
 
-  /**
-   * Returns all build artifacts belonging to the given output groups. May only be called once,
-   * after the build is complete, or no artifacts will be returned.
-   */
-  default ImmutableList<OutputArtifact> getArtifactsForOutputGroup(
-      String outputGroup, Predicate<String> pathFilter) throws GetArtifactsException {
-    return getBuildOutput().getOutputGroupArtifacts(outputGroup, pathFilter);
+  override fun close() {
+    deleteTemporaryOutputFiles()
   }
 
-  @Override
-  void close();
+  class GetArtifactsException : BuildException {
+    constructor(cause: Throwable?) : super(cause)
 
-  /** Indicates a failure to get artifact information */
-  class GetArtifactsException extends BuildException {
-    public GetArtifactsException(Throwable cause) {
-      super(cause);
-    }
+    constructor(message: String?) : super(message)
 
-    public GetArtifactsException(String message) {
-      super(message);
-    }
-
-    public GetArtifactsException(String message, Throwable cause) {
-      super(message, cause);
-    }
+    constructor(message: String?, cause: Throwable?) : super(message, cause)
   }
 
-  /** Indicates a failure to get artifact information */
-  class GetFlagsException extends Exception {
-    public GetFlagsException(String message, Throwable cause) {
-      super(message, cause);
-    }
-
-    public GetFlagsException(String message) {
-      super(message);
-    }
-
-    public GetFlagsException(Throwable cause) {
-      super(cause);
-    }
-  }
+  class GetFlagsException(cause: Throwable?) : Exception(cause)
 }
diff --git a/base/src/com/google/idea/blaze/base/command/buildresult/BuildResultHelperBep.java b/base/src/com/google/idea/blaze/base/command/buildresult/BuildResultHelperBep.java
deleted file mode 100644
index bfb24bda2f9..00000000000
--- a/base/src/com/google/idea/blaze/base/command/buildresult/BuildResultHelperBep.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright 2017 The Bazel Authors. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.idea.blaze.base.command.buildresult;
-
-import com.google.idea.blaze.base.command.buildresult.BuildEventStreamProvider.BuildEventStreamException;
-import com.google.idea.blaze.base.io.InputStreamProvider;
-import com.google.idea.blaze.base.run.testlogs.BlazeTestResults;
-import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.project.Project;
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-import java.util.Optional;
-import org.jetbrains.annotations.VisibleForTesting;
-
-/**
- * Build event protocol implementation to get build results.
- *
- * <p>The build even protocol (BEP for short) is a proto-based protocol used by bazel to communicate
- * build events.
- */
-public class BuildResultHelperBep implements BuildResultHelper {
-
-  private static final Logger logger = Logger.getInstance(BuildResultHelperBep.class);
-  private final File outputFile;
-
-  public BuildResultHelperBep() {
-    outputFile = BuildEventProtocolUtils.createTempOutputFile();
-  }
-
-  @VisibleForTesting
-  public BuildResultHelperBep(File outputFile) {
-    this.outputFile = outputFile;
-  }
-
-  @Override
-  public List<String> getBuildFlags() {
-    return BuildEventProtocolUtils.getBuildFlags(outputFile);
-  }
-
-  @Override
-  public ParsedBepOutput getBuildOutput(Optional<String> completedBuildId)
-      throws GetArtifactsException {
-    try (InputStream inputStream = new BufferedInputStream(new FileInputStream(outputFile))) {
-      return ParsedBepOutput.parseBepArtifacts(inputStream);
-    } catch (IOException | BuildEventStreamException e) {
-      logger.error(e);
-      throw new GetArtifactsException(e.getMessage());
-    }
-  }
-
-  @Override
-  public BlazeTestResults getTestResults(Optional<String> completedBuildId) {
-    try (InputStream inputStream =
-        new BufferedInputStream(InputStreamProvider.getInstance().forFile(outputFile))) {
-      return BuildEventProtocolOutputReader.parseTestResults(inputStream);
-    } catch (IOException | BuildEventStreamException e) {
-      logger.warn(e);
-      return BlazeTestResults.NO_RESULTS;
-    }
-  }
-
-  @Override
-  public void deleteTemporaryOutputFiles() {
-    if (!outputFile.delete()) {
-      logger.warn("Could not delete BEP output file: " + outputFile);
-    }
-  }
-
-  @Override
-  public BuildFlags getBlazeFlags(Optional<String> completedBuildId) throws GetFlagsException {
-    try (InputStream inputStream = new BufferedInputStream(new FileInputStream(outputFile))) {
-      return BuildFlags.parseBep(inputStream);
-    } catch (IOException | BuildEventStreamException e) {
-      throw new GetFlagsException(e);
-    }
-  }
-
-  @Override
-  public void close() {
-    if (!outputFile.delete()) {
-      logger.warn("Could not delete BEP output file: " + outputFile);
-    }
-  }
-
-  public File getOutputFile() {
-    return outputFile;
-  }
-
-  static class Provider implements BuildResultHelperProvider {
-
-    @Override
-    public Optional<BuildResultHelper> doCreateForLocalBuild(Project project) {
-      return Optional.of(new BuildResultHelperBep());
-    }
-  }
-}
diff --git a/base/src/com/google/idea/blaze/base/command/buildresult/BuildResultHelperProvider.java b/base/src/com/google/idea/blaze/base/command/buildresult/BuildResultHelperProvider.java
deleted file mode 100644
index f8798190f6c..00000000000
--- a/base/src/com/google/idea/blaze/base/command/buildresult/BuildResultHelperProvider.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2018 The Bazel Authors. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.idea.blaze.base.command.buildresult;
-
-import com.google.errorprone.annotations.MustBeClosed;
-import com.google.idea.blaze.base.bazel.BuildSystem.BuildInvoker;
-import com.intellij.openapi.extensions.ExtensionPointName;
-import com.intellij.openapi.project.Project;
-import java.util.Optional;
-
-/**
- * Determines which {@link BuildResultHelper} to use for the current project.
- *
- * @deprecated Use {@link BuildInvoker#createBuildResultProvider()} instead which will create a
- *     result helper appropriate for that build invoker.
- */
-@Deprecated
-public interface BuildResultHelperProvider {
-
-  ExtensionPointName<BuildResultHelperProvider> EP_NAME =
-      ExtensionPointName.create("com.google.idea.blaze.BuildResultHelperProvider");
-
-  /**
-   * Constructs a BuildResultHelper that supports a local BEP and artifacts. This is required
-   * because parts of Blaze Plugin implicitly depended on a {@link BuildResultHelper} corresponding
-   * to local builds.
-   *
-   * @deprecated All consumers should be migrated to use {@link
-   *     com.google.idea.blaze.base.bazel.BuildSystem#getBuildInvoker(Project)} and {handle local or
-   *     {@link BuildInvoker#createBuildResultProvider()}.
-   */
-  @Deprecated
-  Optional<BuildResultHelper> doCreateForLocalBuild(Project project);
-
-  /**
-   * Constructs a new build result helper for local builds.
-   *
-   * @deprecated Use {@link BuildInvoker#createBuildResultProvider()} instead which will create a
-   *     result helper appropriate for that build invoker.
-   */
-  @Deprecated
-  @MustBeClosed
-  static BuildResultHelper createForLocalBuild(Project project) {
-    for (BuildResultHelperProvider extension : EP_NAME.getExtensions()) {
-      Optional<BuildResultHelper> helper = extension.doCreateForLocalBuild(project);
-      if (helper.isPresent()) {
-        return helper.get();
-      }
-    }
-    return new BuildResultHelperBep();
-  }
-}
diff --git a/base/src/com/google/idea/blaze/base/run/testlogs/LocalBuildEventProtocolTestFinderStrategy.java b/base/src/com/google/idea/blaze/base/run/testlogs/LocalBuildEventProtocolTestFinderStrategy.java
index 1d7bd7138f4..d1b6c033067 100644
--- a/base/src/com/google/idea/blaze/base/run/testlogs/LocalBuildEventProtocolTestFinderStrategy.java
+++ b/base/src/com/google/idea/blaze/base/run/testlogs/LocalBuildEventProtocolTestFinderStrategy.java
@@ -34,7 +34,7 @@ public LocalBuildEventProtocolTestFinderStrategy(BuildResultHelper buildResultHe
 
   @Override
   public BlazeTestResults findTestResults() throws GetArtifactsException {
-    return buildResultHelper.getTestResults(Optional.empty());
+    return buildResultHelper.getTestResults();
   }
 
   @Override
diff --git a/base/src/com/google/idea/blaze/base/sync/aspects/BlazeIdeInterfaceAspectsImpl.java b/base/src/com/google/idea/blaze/base/sync/aspects/BlazeIdeInterfaceAspectsImpl.java
index cd2212d0e32..112bb0edc9d 100644
--- a/base/src/com/google/idea/blaze/base/sync/aspects/BlazeIdeInterfaceAspectsImpl.java
+++ b/base/src/com/google/idea/blaze/base/sync/aspects/BlazeIdeInterfaceAspectsImpl.java
@@ -34,6 +34,7 @@
 import com.google.idea.blaze.base.async.FutureUtil;
 import com.google.idea.blaze.base.async.executor.BlazeExecutor;
 import com.google.idea.blaze.base.bazel.BuildSystem.BuildInvoker;
+import com.google.idea.blaze.base.buildview.BazelService;
 import com.google.idea.blaze.base.command.BlazeCommand;
 import com.google.idea.blaze.base.command.BlazeCommandName;
 import com.google.idea.blaze.base.command.BlazeFlags;
@@ -751,13 +752,12 @@ private static BlazeBuildOutputs runBuildForTargets(
         viewSet.getScalarValue(AutomaticallyDeriveTargetsSection.KEY).orElse(false);
 
     Path targetPatternFile = prepareTargetPatternFile(project, targets);
-    try (BuildResultHelper buildResultHelper = invoker.createBuildResultHelper()) {
+    try {
       BlazeCommand.Builder builder = BlazeCommand.builder(invoker, BlazeCommandName.BUILD, project);
       builder
           .setInvokeParallel(invokeParallel)
           .addBlazeFlags(BlazeFlags.TARGET_PATTERN_FILE, targetPatternFile.toString())
           .addBlazeFlags(BlazeFlags.KEEP_GOING)
-          .addBlazeFlags(buildResultHelper.getBuildFlags())
           .addBlazeFlags(additionalBlazeFlags);
       if (disableValidationActionExperiment.getValue()) {
         builder.addBlazeFlags(BlazeFlags.DISABLE_VALIDATIONS);
@@ -772,7 +772,7 @@ private static BlazeBuildOutputs runBuildForTargets(
       aspectStrategy.addAspectAndOutputGroups(
           builder, outputGroups, activeLanguages, onlyDirectDeps);
 
-      return invoker.getCommandRunner().run(project, builder, buildResultHelper, context, ImmutableMap.of());
+      return BazelService.instance(project).build(context, builder);
     } finally {
       if (!Registry.is("bazel.sync.keep.target.files")) {
           try {
diff --git a/base/tests/unittests/com/google/idea/blaze/base/run/testlogs/LocalBuildEventProtocolTestFinderStrategyTest.java b/base/tests/unittests/com/google/idea/blaze/base/run/testlogs/LocalBuildEventProtocolTestFinderStrategyTest.java
index 65fdc309e8b..77f922df64b 100644
--- a/base/tests/unittests/com/google/idea/blaze/base/run/testlogs/LocalBuildEventProtocolTestFinderStrategyTest.java
+++ b/base/tests/unittests/com/google/idea/blaze/base/run/testlogs/LocalBuildEventProtocolTestFinderStrategyTest.java
@@ -25,7 +25,6 @@
 import com.google.idea.blaze.base.command.buildresult.BuildEventProtocolOutputReader;
 import com.google.idea.blaze.base.command.buildresult.BuildEventStreamProvider.BuildEventStreamException;
 import com.google.idea.blaze.base.command.buildresult.BuildResultHelper.GetArtifactsException;
-import com.google.idea.blaze.base.command.buildresult.BuildResultHelperBep;
 import com.google.idea.blaze.base.io.InputStreamProvider;
 import com.google.idea.blaze.base.io.MockInputStreamProvider;
 import com.intellij.openapi.vfs.LocalFileSystem;
diff --git a/clwb/src/com/google/idea/blaze/clwb/run/BlazeCidrRunConfigurationRunner.java b/clwb/src/com/google/idea/blaze/clwb/run/BlazeCidrRunConfigurationRunner.java
index 0f3a5e6f9ed..423c3ee4ced 100644
--- a/clwb/src/com/google/idea/blaze/clwb/run/BlazeCidrRunConfigurationRunner.java
+++ b/clwb/src/com/google/idea/blaze/clwb/run/BlazeCidrRunConfigurationRunner.java
@@ -21,7 +21,6 @@
 import com.google.idea.blaze.base.command.BlazeInvocationContext;
 import com.google.idea.blaze.base.command.buildresult.BuildResultHelper;
 import com.google.idea.blaze.base.command.buildresult.BuildResultHelper.GetArtifactsException;
-import com.google.idea.blaze.base.command.buildresult.BuildResultHelperProvider;
 import com.google.idea.blaze.base.command.buildresult.LocalFileArtifact;
 import com.google.idea.blaze.base.model.primitives.Label;
 import com.google.idea.blaze.base.model.primitives.TargetExpression;
@@ -138,8 +137,7 @@ private ImmutableList<String> getExtraDebugFlags(ExecutionEnvironment env) {
    */
   private File getExecutableToDebug(ExecutionEnvironment env) throws ExecutionException {
     SaveUtil.saveAllFiles();
-    try (BuildResultHelper buildResultHelper =
-        BuildResultHelperProvider.createForLocalBuild(env.getProject())) {
+    try (final var buildResultHelper = new BuildResultHelper()) {
       ListenableFuture<BuildResult> buildOperation =
           BlazeBeforeRunCommandHelper.runBlazeCommand(
               BlazeCommandName.BUILD,
diff --git a/python/src/com/google/idea/blaze/python/run/BlazePyRunConfigurationRunner.java b/python/src/com/google/idea/blaze/python/run/BlazePyRunConfigurationRunner.java
index 81de18d57bc..ec418619d68 100644
--- a/python/src/com/google/idea/blaze/python/run/BlazePyRunConfigurationRunner.java
+++ b/python/src/com/google/idea/blaze/python/run/BlazePyRunConfigurationRunner.java
@@ -25,7 +25,6 @@
 import com.google.idea.blaze.base.command.BlazeInvocationContext;
 import com.google.idea.blaze.base.command.buildresult.BuildResultHelper;
 import com.google.idea.blaze.base.command.buildresult.BuildResultHelper.GetArtifactsException;
-import com.google.idea.blaze.base.command.buildresult.BuildResultHelperProvider;
 import com.google.idea.blaze.base.command.buildresult.LocalFileArtifact;
 import com.google.idea.blaze.base.ideinfo.PyIdeInfo;
 import com.google.idea.blaze.base.ideinfo.TargetIdeInfo;
@@ -310,8 +309,7 @@ private static PyExecutionInfo getExecutableToDebug(ExecutionEnvironment env)
     SaveUtil.saveAllFiles();
     // Explicitly depend on local build helper because the debuggable binary is expected to be
     // present locally
-    try (BuildResultHelper buildResultHelper =
-        BuildResultHelperProvider.createForLocalBuild(project)) {
+    try (final var buildResultHelper = new BuildResultHelper()) {
 
       ListenableFuture<BuildResult> buildOperation =
           BlazeBeforeRunCommandHelper.runBlazeCommand(

From c0e5fb4f59f1efa58290d3dda1848085f964409e Mon Sep 17 00:00:00 2001
From: Daniel Brauner <daniel.brauner@jetbrains.com>
Date: Mon, 23 Sep 2024 13:04:21 +0200
Subject: [PATCH 08/17] fixed clwb tests

---
 .../command/buildresult/BuildResultHelper.kt  |   5 +-
 .../blaze/base/scope/output/IssueOutput.kt    |  19 +-
 .../issueparser/BlazeIssueParserTest.java     | 165 ++++--------------
 .../parser/ProjectViewParserTest.java         |   8 +
 ...ldEventProtocolTestFinderStrategyTest.java |  49 +-----
 .../google/idea/blaze/base/BlazeTestCase.java |   5 +
 .../base/bazel/FakeBuildResultHelperBep.java  |  73 --------
 .../google/idea/blaze/base/io/TempFile.java   |  30 ++++
 .../idea/blaze/base/scope/ErrorCollector.java |   6 +-
 .../PyIssueParserProviderTest.java            |  28 ++-
 10 files changed, 117 insertions(+), 271 deletions(-)
 delete mode 100644 base/tests/utils/unit/com/google/idea/blaze/base/bazel/FakeBuildResultHelperBep.java
 create mode 100644 base/tests/utils/unit/com/google/idea/blaze/base/io/TempFile.java

diff --git a/base/src/com/google/idea/blaze/base/command/buildresult/BuildResultHelper.kt b/base/src/com/google/idea/blaze/base/command/buildresult/BuildResultHelper.kt
index 8ce74d405a2..9b474bb0451 100644
--- a/base/src/com/google/idea/blaze/base/command/buildresult/BuildResultHelper.kt
+++ b/base/src/com/google/idea/blaze/base/command/buildresult/BuildResultHelper.kt
@@ -38,8 +38,9 @@ private val LOG = Logger.getInstance(BuildResultHelper::class.java)
  * The build even protocol (BEP for short) is a proto-based protocol used by bazel to communicate
  * build events.
  */
-class BuildResultHelper : AutoCloseable {
-  val outputFile: File = BuildEventProtocolUtils.createTempOutputFile()
+class BuildResultHelper(val outputFile: File) : AutoCloseable {
+
+  constructor() : this(BuildEventProtocolUtils.createTempOutputFile())
 
   /**
    * Returns the build flags necessary for the build result helper to work.
diff --git a/base/src/com/google/idea/blaze/base/scope/output/IssueOutput.kt b/base/src/com/google/idea/blaze/base/scope/output/IssueOutput.kt
index cf91379e8a1..e14bf5ad912 100644
--- a/base/src/com/google/idea/blaze/base/scope/output/IssueOutput.kt
+++ b/base/src/com/google/idea/blaze/base/scope/output/IssueOutput.kt
@@ -17,7 +17,6 @@
 
 package com.google.idea.blaze.base.scope.output
 
-import com.google.idea.blaze.base.io.VfsUtils
 import com.google.idea.blaze.common.Context
 import com.google.idea.blaze.common.Output
 import com.intellij.build.events.MessageEvent
@@ -25,11 +24,12 @@ import com.intellij.build.issue.BuildIssue
 import com.intellij.build.issue.BuildIssueQuickFix
 import com.intellij.openapi.fileEditor.OpenFileDescriptor
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.pom.Navigatable
 import java.io.File
 
 /** An issue in a blaze operation.  */
-class IssueOutput (
+class IssueOutput(
   issue: BuildIssue,
   val kind: MessageEvent.Kind,
 ) : Output, BuildIssue by issue {
@@ -52,18 +52,25 @@ class IssueOutput (
   }
 
   @Deprecated("used only for backwards compatibility")
-  fun getMessage(): String = "$title\n$description"
+  fun getMessage(): String {
+    return if (description.isBlank()) {
+      title
+    } else {
+      "$title\n$description"
+    }
+  }
 
   class Builder(private val kind: MessageEvent.Kind, private val title: String) {
     private var description: String = ""
     private var navigatable: (Project) -> Navigatable? = { null }
     private val fixes: MutableList<Pair<String, BuildIssueQuickFix>> = mutableListOf()
 
-    fun withFile(file: File): Builder = withFile(file, line = 0, column = 0)
+    fun withFile(file: File?): Builder = withFile(file, line = 0, column = 0)
 
-    fun withFile(file: File, line: Int = 0, column: Int = 0): Builder {
-      val virtualFile = VfsUtils.resolveVirtualFile(file, false)
+    fun withFile(file: File?, line: Int = 0, column: Int = 0): Builder {
+      if (file == null) return this
 
+      val virtualFile = VfsUtil.findFileByIoFile(file, false)
       if (virtualFile != null) {
         navigatable = { OpenFileDescriptor(it, virtualFile, line, column) }
       }
diff --git a/base/tests/unittests/com/google/idea/blaze/base/issueparser/BlazeIssueParserTest.java b/base/tests/unittests/com/google/idea/blaze/base/issueparser/BlazeIssueParserTest.java
index 38022a520cb..34488bff228 100644
--- a/base/tests/unittests/com/google/idea/blaze/base/issueparser/BlazeIssueParserTest.java
+++ b/base/tests/unittests/com/google/idea/blaze/base/issueparser/BlazeIssueParserTest.java
@@ -16,9 +16,6 @@
 package com.google.idea.blaze.base.issueparser;
 
 import static com.google.common.truth.Truth.assertThat;
-import static com.google.idea.blaze.base.scope.output.IssueOutput.Category.ERROR;
-import static com.google.idea.blaze.base.scope.output.IssueOutput.Category.NOTE;
-import static com.google.idea.blaze.base.scope.output.IssueOutput.Category.WARNING;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -40,9 +37,18 @@
 import com.google.idea.blaze.base.sync.data.BlazeProjectDataManager;
 import com.google.idea.common.experiments.ExperimentService;
 import com.google.idea.common.experiments.MockExperimentService;
+import com.intellij.build.events.MessageEvent.Kind;
+import com.intellij.openapi.fileEditor.OpenFileDescriptor;
 import com.intellij.openapi.util.TextRange;
+import com.intellij.openapi.vfs.LocalFileSystem;
+import com.intellij.openapi.vfs.VirtualFileManager;
+import com.intellij.openapi.vfs.VirtualFileManagerListener;
+import com.intellij.openapi.vfs.impl.VirtualFileManagerImpl;
+import com.intellij.openapi.vfs.impl.local.LocalFileSystemImpl;
+import com.intellij.openapi.vfs.local.CoreLocalFileSystem;
 import java.io.File;
 import java.util.Arrays;
+import java.util.List;
 import java.util.regex.Matcher;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -66,6 +72,9 @@ protected void initTest(Container applicationServices, Container projectServices
     registerExtensionPoint(FileResolver.EP_NAME, FileResolver.class)
         .registerExtension(new StandardFileResolver());
 
+    registerExtensionPointByName("com.intellij.virtualFileManagerListener", VirtualFileManagerListener.class);
+    applicationServices.register(VirtualFileManager.class, new VirtualFileManagerImpl(List.of(new CoreLocalFileSystem())));
+
     ProjectViewManager projectViewManager = mock(ProjectViewManager.class);
     projectServices.register(ProjectViewManager.class, projectViewManager);
 
@@ -117,7 +126,7 @@ public void testParseTargetError() {
                 + "'javatests/com/google/devtools/aswb/testapps/aswbtestlib/...': "
                 + "package name component contains only '.' characters.");
     assertThat(issue).isNotNull();
-    assertThat(issue.getCategory()).isEqualTo(ERROR);
+    assertThat(issue.getKind()).isEqualTo(Kind.ERROR);
   }
 
   @Test
@@ -128,17 +137,9 @@ public void testParseCompileErrorWithAbsolutePath() {
             "/absolute/location/google3/java/com/google/android/SomeKotlin.kt:17: error: "
                 + "non-static variable this cannot be referenced from a static context");
     assertThat(issue).isNotNull();
-    assertThat(issue.getFile().getPath())
-        .isEqualTo("/absolute/location/google3/java/com/google/android/SomeKotlin.kt");
-    assertThat(issue.getLine()).isEqualTo(17);
-    assertThat(issue.getColumn()).isEqualTo(-1);
     assertThat(issue.getMessage())
         .isEqualTo("non-static variable this cannot be referenced from a static context");
-    assertThat(issue.getCategory()).isEqualTo(ERROR);
-    assertThat(issue.getConsoleHyperlinkRange())
-        .isEqualTo(
-            TextRange.create(
-                0, "/absolute/location/google3/java/com/google/android/SomeKotlin.kt:17".length()));
+    assertThat(issue.getKind()).isEqualTo(Kind.ERROR);
   }
 
   @Test
@@ -149,17 +150,9 @@ public void testParseCompileError() {
             "java/com/google/android/samples/helloroot/math/DivideMath.java:17: error: "
                 + "non-static variable this cannot be referenced from a static context");
     assertThat(issue).isNotNull();
-    assertThat(issue.getFile().getPath())
-        .isEqualTo("/root/java/com/google/android/samples/helloroot/math/DivideMath.java");
-    assertThat(issue.getLine()).isEqualTo(17);
-    assertThat(issue.getColumn()).isEqualTo(-1);
     assertThat(issue.getMessage())
         .isEqualTo("non-static variable this cannot be referenced from a static context");
-    assertThat(issue.getCategory()).isEqualTo(ERROR);
-    assertThat(issue.getConsoleHyperlinkRange())
-        .isEqualTo(
-            TextRange.create(
-                0, "java/com/google/android/samples/helloroot/math/DivideMath.java:17".length()));
+    assertThat(issue.getKind()).isEqualTo(Kind.ERROR);
   }
 
   @Test
@@ -170,16 +163,8 @@ public void testParseCompileErrorWithColumn() {
             "java/com/google/devtools/aswb/pluginrepo/googleplex/PluginsEndpoint.java:33:26: "
                 + "error: '|' is not preceded with whitespace.");
     assertThat(issue).isNotNull();
-    assertThat(issue.getLine()).isEqualTo(33);
-    assertThat(issue.getColumn()).isEqualTo(26);
     assertThat(issue.getMessage()).isEqualTo("'|' is not preceded with whitespace.");
-    assertThat(issue.getCategory()).isEqualTo(ERROR);
-    assertThat(issue.getConsoleHyperlinkRange())
-        .isEqualTo(
-            TextRange.create(
-                0,
-                "java/com/google/devtools/aswb/pluginrepo/googleplex/PluginsEndpoint.java:33:26"
-                    .length()));
+    assertThat(issue.getKind()).isEqualTo(Kind.ERROR);
   }
 
   @Test
@@ -190,12 +175,8 @@ public void testParseCompileFatalErrorWithColumn() {
         blazeIssueParser.parseIssue(
             "net/something/foo_bar.cc:29:10: fatal error: 'util/ptr_util2.h' file not found");
     assertThat(issue).isNotNull();
-    assertThat(issue.getLine()).isEqualTo(29);
-    assertThat(issue.getColumn()).isEqualTo(10);
     assertThat(issue.getMessage()).isEqualTo("'util/ptr_util2.h' file not found");
-    assertThat(issue.getCategory()).isEqualTo(ERROR);
-    assertThat(issue.getConsoleHyperlinkRange())
-        .isEqualTo(TextRange.create(0, "net/something/foo_bar.cc:29:10".length()));
+    assertThat(issue.getKind()).isEqualTo(Kind.ERROR);
   }
 
   @Test
@@ -207,13 +188,9 @@ public void testParseCompileNoteWithColumn() {
             "net/something/foo_bar.cc:30:11: note: in instantiation of member function "
                 + "foo<bar>::baz() requested here ...");
     assertThat(issue).isNotNull();
-    assertThat(issue.getLine()).isEqualTo(30);
-    assertThat(issue.getColumn()).isEqualTo(11);
     assertThat(issue.getMessage())
         .isEqualTo("in instantiation of member function foo<bar>::baz() requested here ...");
-    assertThat(issue.getCategory()).isEqualTo(NOTE);
-    assertThat(issue.getConsoleHyperlinkRange())
-        .isEqualTo(TextRange.create(0, "net/something/foo_bar.cc:30:11".length()));
+    assertThat(issue.getKind()).isEqualTo(Kind.INFO);
   }
 
   @Test
@@ -224,16 +201,9 @@ public void testParseBuildError() {
             "ERROR: /root/javatests/package_path/BUILD:42:12: "
                 + "Target '//java/package_path:helloroot_visibility' failed");
     assertThat(issue).isNotNull();
-    assertThat(issue.getFile().getPath()).isEqualTo("/root/javatests/package_path/BUILD");
-    assertThat(issue.getLine()).isEqualTo(42);
-    assertThat(issue.getColumn()).isEqualTo(12);
     assertThat(issue.getMessage())
         .isEqualTo("Target '//java/package_path:helloroot_visibility' failed");
-    assertThat(issue.getCategory()).isEqualTo(ERROR);
-    assertThat(issue.getConsoleHyperlinkRange())
-        .isEqualTo(
-            TextRange.create(
-                "ERROR: ".length(), "ERROR: /root/javatests/package_path/BUILD:42:12".length()));
+    assertThat(issue.getKind()).isEqualTo(Kind.ERROR);
   }
 
   @Test
@@ -244,16 +214,9 @@ public void testParseBuildBazelError() {
             "ERROR: /root/javatests/package_path/BUILD.bazel:42:12: "
                 + "Target '//java/package_path:helloroot_visibility' failed");
     assertThat(issue).isNotNull();
-    assertThat(issue.getFile().getPath()).isEqualTo("/root/javatests/package_path/BUILD.bazel");
-    assertThat(issue.getLine()).isEqualTo(42);
-    assertThat(issue.getColumn()).isEqualTo(12);
     assertThat(issue.getMessage())
         .isEqualTo("Target '//java/package_path:helloroot_visibility' failed");
-    assertThat(issue.getCategory()).isEqualTo(ERROR);
-    assertThat(issue.getConsoleHyperlinkRange())
-        .isEqualTo(
-            TextRange.create(
-                "ERROR: ".length(), "ERROR: /root/javatests/package_path/BUILD.bazel:42:12".length()));
+    assertThat(issue.getKind()).isEqualTo(Kind.ERROR);
   }
 
   @Test
@@ -264,17 +227,8 @@ public void testParseSkylarkError() {
             "ERROR: /root/third_party/bazel/tools/ide/intellij_info_impl.bzl:42:12: "
                 + "Variable artifact_location is read only");
     assertThat(issue).isNotNull();
-    assertThat(issue.getFile().getPath())
-        .isEqualTo("/root/third_party/bazel/tools/ide/intellij_info_impl.bzl");
-    assertThat(issue.getLine()).isEqualTo(42);
-    assertThat(issue.getColumn()).isEqualTo(12);
     assertThat(issue.getMessage()).isEqualTo("Variable artifact_location is read only");
-    assertThat(issue.getCategory()).isEqualTo(ERROR);
-    assertThat(issue.getConsoleHyperlinkRange())
-        .isEqualTo(
-            TextRange.create(
-                "ERROR: ".length(),
-                "ERROR: /root/third_party/bazel/tools/ide/intellij_info_impl.bzl:42:12".length()));
+    assertThat(issue.getKind()).isEqualTo(Kind.ERROR);
   }
 
   @Test
@@ -285,13 +239,8 @@ public void testParseLinelessBuildError() {
             "ERROR: /path/to/root/java/package_path/BUILD:char offsets 1222--1229: "
                 + "name 'grubber' is not defined");
     assertThat(issue).isNotNull();
-    assertThat(issue.getFile().getPath()).isEqualTo("/path/to/root/java/package_path/BUILD");
     assertThat(issue.getMessage()).isEqualTo("name 'grubber' is not defined");
-    assertThat(issue.getCategory()).isEqualTo(ERROR);
-    assertThat(issue.getConsoleHyperlinkRange())
-        .isEqualTo(
-            TextRange.create(
-                "ERROR: ".length(), "ERROR: /path/to/root/java/package_path/BUILD".length()));
+    assertThat(issue.getKind()).isEqualTo(Kind.ERROR);
   }
 
   @Test
@@ -302,10 +251,8 @@ public void testParseFileNotFoundError() {
             "ERROR: Extension file not found. Unable to load file '//third_party/bazel:tools/ide/"
                 + "intellij_info.bzl': file doesn't exist or isn't a file");
     assertThat(issue).isNotNull();
-    assertThat(issue.getFile().getPath())
-        .isEqualTo("/root/third_party/bazel/tools/ide/intellij_info.bzl");
     assertThat(issue.getMessage()).isEqualTo("file doesn't exist or isn't a file");
-    assertThat(issue.getCategory()).isEqualTo(ERROR);
+    assertThat(issue.getKind()).isEqualTo(Kind.ERROR);
   }
 
   @Test
@@ -317,10 +264,8 @@ public void testParseFileNotFoundErrorWithPackage() {
                 + " load file '//third_party/bazel:tools/ide/intellij_info.bzl': file doesn't exist"
                 + " or isn't a file");
     assertThat(issue).isNotNull();
-    assertThat(issue.getFile().getPath())
-        .isEqualTo("/root/third_party/bazel/tools/ide/intellij_info.bzl");
     assertThat(issue.getMessage()).isEqualTo("file doesn't exist or isn't a file");
-    assertThat(issue.getCategory()).isEqualTo(ERROR);
+    assertThat(issue.getKind()).isEqualTo(Kind.ERROR);
   }
 
   @Test
@@ -332,8 +277,7 @@ public void testLabelProjectViewParser() {
                 + "target 'hello4' not declared in package 'package/path' "
                 + "defined by /path/to/root/package/path/BUILD");
     assertThat(issue).isNotNull();
-    assertThat(issue.getFile().getPath()).isEqualTo(".blazeproject");
-    assertThat(issue.getCategory()).isEqualTo(ERROR);
+    assertThat(issue.getKind()).isEqualTo(Kind.ERROR);
   }
 
   @Test
@@ -343,8 +287,7 @@ public void testPackageProjectViewParser() {
         blazeIssueParser.parseIssue(
             "no such package 'package/path': BUILD file not found on package path");
     assertThat(issue).isNotNull();
-    assertThat(issue.getFile().getPath()).isEqualTo(".blazeproject");
-    assertThat(issue.getCategory()).isEqualTo(ERROR);
+    assertThat(issue.getKind()).isEqualTo(Kind.ERROR);
   }
 
   @Test
@@ -355,9 +298,7 @@ public void testDeletedBUILDFileButLeftPackageInLocalTargets() {
             "Error:com.google.a.b.Exception exception in Bar: no targets found beneath "
                 + "'tests/com/google/a/b/c/d/baz' Thrown during call: ...");
     assertThat(issue).isNotNull();
-    assertThat(issue.getFile()).isNotNull();
-    assertThat(issue.getFile().getPath()).isEqualTo(".blazeproject");
-    assertThat(issue.getCategory()).isEqualTo(ERROR);
+    assertThat(issue.getKind()).isEqualTo(Kind.ERROR);
     assertThat(issue.getMessage())
         .isEqualTo("no targets found beneath 'tests/com/google/a/b/c/d/baz'");
   }
@@ -383,9 +324,8 @@ public void testMultilineTraceback() {
 
     IssueOutput issue = blazeIssueParser.parseIssue(lines[lines.length - 1]);
     assertThat(issue).isNotNull();
-    assertThat(issue.getFile().getPath()).isEqualTo("/home/plumpy/whatever");
     assertThat(issue.getMessage().split("\n")).hasLength(lines.length);
-    assertThat(issue.getCategory()).isEqualTo(ERROR);
+    assertThat(issue.getKind()).isEqualTo(Kind.ERROR);
   }
 
   @Test
@@ -410,9 +350,8 @@ public void testLineAfterTracebackIsAlsoParsed() {
         blazeIssueParser.parseIssue(
             "ERROR: /home/plumpy/whatever:char offsets 1222--1229: name 'grubber' is not defined");
     assertThat(issue).isNotNull();
-    assertThat(issue.getFile().getPath()).isEqualTo("/home/plumpy/whatever");
     assertThat(issue.getMessage()).isEqualTo("name 'grubber' is not defined");
-    assertThat(issue.getCategory()).isEqualTo(ERROR);
+    assertThat(issue.getKind()).isEqualTo(Kind.ERROR);
   }
 
   @Test
@@ -439,10 +378,7 @@ public void testExtraParserMatch() {
         blazeIssueParser.parseIssue("TEST This is a test message for our test parser.");
     assertThat(issue).isNotNull();
     assertThat(issue.getMessage()).isEqualTo("This is a test message for our test parser.");
-    assertThat(issue.getLine()).isEqualTo(-1);
-    assertThat(issue.getColumn()).isEqualTo(-1);
-    assertThat(issue.getCategory()).isEqualTo(WARNING);
-    assertThat(issue.getFile()).isNull();
+    assertThat(issue.getKind()).isEqualTo(Kind.WARNING);
   }
 
   @Test
@@ -455,7 +391,7 @@ public void testParseGenericError() {
       IssueOutput issue = blazeIssueParser.parseIssue("ERROR: " + msg);
       assertThat(issue).isNotNull();
       assertThat(issue.getMessage()).isEqualTo(msg);
-      assertThat(issue.getCategory()).isEqualTo(ERROR);
+      assertThat(issue.getKind()).isEqualTo(Kind.ERROR);
     }
   }
 
@@ -515,14 +451,8 @@ public void testParseTypeScriptCompileError() {
         blazeIssueParser.parseIssue(
             "foo/bar/baz.ts:123:45 - error TS2304: Cannot find name 'asdf'.");
     assertThat(issue).isNotNull();
-    assertThat(issue.getFile()).isNotNull();
-    assertThat(issue.getFile().getPath()).isEqualTo("/root/foo/bar/baz.ts");
-    assertThat(issue.getLine()).isEqualTo(123);
-    assertThat(issue.getColumn()).isEqualTo(45);
     assertThat(issue.getMessage()).isEqualTo("TS2304: Cannot find name 'asdf'.");
-    assertThat(issue.getCategory()).isEqualTo(ERROR);
-    assertThat(issue.getConsoleHyperlinkRange())
-        .isEqualTo(TextRange.create(0, "foo/bar/baz.ts:123:45".length()));
+    assertThat(issue.getKind()).isEqualTo(Kind.ERROR);
   }
 
   @Test
@@ -532,14 +462,8 @@ public void testParseJavaScriptCompileError() {
         blazeIssueParser.parseIssue(
             "foo/bar.js:10: ERROR - [JSC_UNDEFINED_VARIABLE] variable foo is undeclared");
     assertThat(issue).isNotNull();
-    assertThat(issue.getFile()).isNotNull();
-    assertThat(issue.getFile().getPath()).isEqualTo("/root/foo/bar.js");
-    assertThat(issue.getLine()).isEqualTo(10);
-    assertThat(issue.getColumn()).isEqualTo(-1);
     assertThat(issue.getMessage()).isEqualTo("[JSC_UNDEFINED_VARIABLE] variable foo is undeclared");
-    assertThat(issue.getCategory()).isEqualTo(ERROR);
-    assertThat(issue.getConsoleHyperlinkRange())
-        .isEqualTo(TextRange.create(0, "foo/bar.js:10".length()));
+    assertThat(issue.getKind()).isEqualTo(Kind.ERROR);
   }
 
   @Test
@@ -550,15 +474,9 @@ public void testParseInfo() {
             "abc/SomeClass.kt:117:11: info: 'when' expression on sealed"
                 + " classes is recommended to be exhaustive");
     assertThat(issue).isNotNull();
-    assertThat(issue.getLine()).isEqualTo(117);
-    assertThat(issue.getColumn()).isEqualTo(11);
-    assertThat(issue.getFile()).isNotNull();
-    assertThat(issue.getFile().getPath()).isEqualTo("/root/abc/SomeClass.kt");
     assertThat(issue.getMessage())
         .isEqualTo("'when' expression on sealed classes is recommended to be exhaustive");
-    assertThat(issue.getCategory()).isEqualTo(NOTE);
-    assertThat(issue.getConsoleHyperlinkRange())
-        .isEqualTo(TextRange.create(0, "abc/SomeClass.kt:117:11".length()));
+    assertThat(issue.getKind()).isEqualTo(Kind.INFO);
   }
 
   @Test
@@ -566,14 +484,8 @@ public void testParseGoCompileError() {
     BlazeIssueParser blazeIssueParser = new BlazeIssueParser(parsers);
     IssueOutput issue = blazeIssueParser.parseIssue("foo/bar.go:123:45: undefined: asdf");
     assertThat(issue).isNotNull();
-    assertThat(issue.getFile()).isNotNull();
-    assertThat(issue.getFile().getPath()).isEqualTo("/root/foo/bar.go");
-    assertThat(issue.getLine()).isEqualTo(123);
-    assertThat(issue.getColumn()).isEqualTo(45);
     assertThat(issue.getMessage()).isEqualTo("undefined: asdf");
-    assertThat(issue.getCategory()).isEqualTo(ERROR);
-    assertThat(issue.getConsoleHyperlinkRange())
-        .isEqualTo(TextRange.create(0, "foo/bar.go:123:45".length()));
+    assertThat(issue.getKind()).isEqualTo(Kind.ERROR);
   }
 
   @Test
@@ -583,13 +495,8 @@ public void testParsePythonCompileError() {
         blazeIssueParser.parseIssue(
             "File \"foo/bar.py\", line 123, in foo: bad option in return type [bad-return-type]");
     assertThat(issue).isNotNull();
-    assertThat(issue.getFile()).isNotNull();
-    assertThat(issue.getFile().getPath()).isEqualTo("/root/foo/bar.py");
-    assertThat(issue.getLine()).isEqualTo(123);
     assertThat(issue.getMessage()).isEqualTo("in foo: bad option in return type [bad-return-type]");
-    assertThat(issue.getCategory()).isEqualTo(ERROR);
-    assertThat(issue.getConsoleHyperlinkRange())
-        .isEqualTo(TextRange.create(0, "File \"foo/bar.py\", line 123".length()));
+    assertThat(issue.getKind()).isEqualTo(Kind.ERROR);
   }
 
   /** Simple Parser for testing */
diff --git a/base/tests/unittests/com/google/idea/blaze/base/projectview/parser/ProjectViewParserTest.java b/base/tests/unittests/com/google/idea/blaze/base/projectview/parser/ProjectViewParserTest.java
index da781b00d4f..09f76116b96 100644
--- a/base/tests/unittests/com/google/idea/blaze/base/projectview/parser/ProjectViewParserTest.java
+++ b/base/tests/unittests/com/google/idea/blaze/base/projectview/parser/ProjectViewParserTest.java
@@ -49,9 +49,14 @@
 import com.google.idea.blaze.base.sync.workspace.WorkspacePathResolverImpl;
 import com.google.idea.common.experiments.ExperimentService;
 import com.google.idea.common.experiments.MockExperimentService;
+import com.intellij.openapi.vfs.VirtualFileManager;
+import com.intellij.openapi.vfs.VirtualFileManagerListener;
+import com.intellij.openapi.vfs.impl.VirtualFileManagerImpl;
+import com.intellij.openapi.vfs.local.CoreLocalFileSystem;
 import java.io.File;
 import java.io.IOException;
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import javax.annotation.Nullable;
@@ -105,6 +110,9 @@ protected void initTest(
     applicationServices.register(ProjectViewStorageManager.class, projectViewStorageManager);
     applicationServices.register(ExperimentService.class, new MockExperimentService());
     registerExtensionPoint(BlazeSyncPlugin.EP_NAME, BlazeSyncPlugin.class);
+
+    registerExtensionPointByName("com.intellij.virtualFileManagerListener", VirtualFileManagerListener.class);
+    applicationServices.register(VirtualFileManager.class, new VirtualFileManagerImpl(List.of(new CoreLocalFileSystem())));
   }
 
   @Test
diff --git a/base/tests/unittests/com/google/idea/blaze/base/run/testlogs/LocalBuildEventProtocolTestFinderStrategyTest.java b/base/tests/unittests/com/google/idea/blaze/base/run/testlogs/LocalBuildEventProtocolTestFinderStrategyTest.java
index 77f922df64b..3403600d913 100644
--- a/base/tests/unittests/com/google/idea/blaze/base/run/testlogs/LocalBuildEventProtocolTestFinderStrategyTest.java
+++ b/base/tests/unittests/com/google/idea/blaze/base/run/testlogs/LocalBuildEventProtocolTestFinderStrategyTest.java
@@ -24,54 +24,37 @@
 import com.google.idea.blaze.base.BlazeTestCase;
 import com.google.idea.blaze.base.command.buildresult.BuildEventProtocolOutputReader;
 import com.google.idea.blaze.base.command.buildresult.BuildEventStreamProvider.BuildEventStreamException;
+import com.google.idea.blaze.base.command.buildresult.BuildResultHelper;
 import com.google.idea.blaze.base.command.buildresult.BuildResultHelper.GetArtifactsException;
-import com.google.idea.blaze.base.io.InputStreamProvider;
-import com.google.idea.blaze.base.io.MockInputStreamProvider;
+import com.google.idea.blaze.base.io.TempFile;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
-import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
-import org.mockito.Mockito;
 
 /** Unit tests for {@link LocalBuildEventProtocolTestFinderStrategy}. */
 @RunWith(JUnit4.class)
 public class LocalBuildEventProtocolTestFinderStrategyTest extends BlazeTestCase {
 
-  private MockInputStreamProvider inputStreamProvider;
-  private final Set<File> deletedFiles = new HashSet<>();
-
-  @After
-  public void clearState() {
-    deletedFiles.clear();
-  }
-
-  @Override
-  protected void initTest(Container applicationServices, Container projectServices) {
-    inputStreamProvider = new MockInputStreamProvider();
-    applicationServices.register(InputStreamProvider.class, inputStreamProvider);
-  }
-
   @Test
   public void testFinder_fileDeletedAfterCleanup() throws GetArtifactsException {
-    File file = createMockFile("/tmp/bep_output.txt", new byte[0]);
+    File file = TempFile.create();
 
     LocalBuildEventProtocolTestFinderStrategy testFinder =
-        new LocalBuildEventProtocolTestFinderStrategy(new BuildResultHelperBep(file));
+        new LocalBuildEventProtocolTestFinderStrategy(new BuildResultHelper(file));
     try {
       BlazeTestResults unused = testFinder.findTestResults();
     } finally {
       testFinder.deleteTemporaryOutputFiles();
     }
 
-    assertThat(deletedFiles).contains(file);
+    assertThat(file.exists()).isFalse();
   }
 
   @Test
@@ -87,12 +70,11 @@ public void findTestResults_shouldMatchBuildEventProtocolOutputReader()
             "//java/com/google:Test2",
             BuildEventStreamProtos.TestStatus.INCOMPLETE,
             ImmutableList.of("/usr/local/tmp/_cache/second_result.xml"));
-    File bepOutputFile =
-        createMockFile("/tmp/bep_output.txt", asByteArray(ImmutableList.of(test1, test2)));
+    File bepOutputFile = TempFile.create(asByteArray(ImmutableList.of(test1, test2)));
     LocalBuildEventProtocolTestFinderStrategy strategy =
-        new LocalBuildEventProtocolTestFinderStrategy(new BuildResultHelperBep(bepOutputFile));
+        new LocalBuildEventProtocolTestFinderStrategy(new BuildResultHelper(bepOutputFile));
 
-    InputStream inputStream = inputStreamProvider.forFile(bepOutputFile);
+    InputStream inputStream = new FileInputStream(bepOutputFile);
     BlazeTestResults results = BuildEventProtocolOutputReader.parseTestResults(inputStream);
     BlazeTestResults finderStrategyResults = strategy.findTestResults();
 
@@ -100,19 +82,6 @@ public void findTestResults_shouldMatchBuildEventProtocolOutputReader()
         .containsExactlyElementsIn(results.perTargetResults.entries());
   }
 
-  private File createMockFile(String path, byte[] contents) {
-    File org = new File(path);
-    File spy = Mockito.spy(org);
-    inputStreamProvider.addFile(path, contents);
-    Mockito.when(spy.delete())
-        .then(
-            invocationOnMock -> {
-              deletedFiles.add(spy);
-              return true;
-            });
-    return spy;
-  }
-
   private static byte[] asByteArray(Iterable<BuildEventStreamProtos.BuildEvent.Builder> events)
       throws IOException {
     ByteArrayOutputStream output = new ByteArrayOutputStream();
diff --git a/base/tests/utils/unit/com/google/idea/blaze/base/BlazeTestCase.java b/base/tests/utils/unit/com/google/idea/blaze/base/BlazeTestCase.java
index f44b3618ed1..aff32e142d3 100644
--- a/base/tests/utils/unit/com/google/idea/blaze/base/BlazeTestCase.java
+++ b/base/tests/utils/unit/com/google/idea/blaze/base/BlazeTestCase.java
@@ -141,4 +141,9 @@ protected <T> ExtensionPointImpl<T> registerExtensionPoint(
     extensionsArea.registerExtensionPoint(name.getName(), type.getName(), Kind.INTERFACE);
     return extensionsArea.getExtensionPoint(name.getName());
   }
+
+  protected <T> ExtensionPointImpl<T> registerExtensionPointByName(String name, Class<T> type) {
+    extensionsArea.registerExtensionPoint(name, type.getName(), Kind.INTERFACE);
+    return extensionsArea.getExtensionPoint(name);
+  }
 }
diff --git a/base/tests/utils/unit/com/google/idea/blaze/base/bazel/FakeBuildResultHelperBep.java b/base/tests/utils/unit/com/google/idea/blaze/base/bazel/FakeBuildResultHelperBep.java
deleted file mode 100644
index bbc4dae0d70..00000000000
--- a/base/tests/utils/unit/com/google/idea/blaze/base/bazel/FakeBuildResultHelperBep.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2022 The Bazel Authors. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.idea.blaze.base.bazel;
-
-import com.google.common.collect.ImmutableList;
-import com.google.idea.blaze.base.command.buildresult.BuildFlags;
-import com.google.idea.blaze.base.command.buildresult.BuildResultHelper;
-import com.google.idea.blaze.base.command.buildresult.ParsedBepOutput;
-import com.google.idea.blaze.base.run.testlogs.BlazeTestResults;
-import java.util.List;
-import java.util.Optional;
-import javax.annotation.Nullable;
-
-public final class FakeBuildResultHelperBep implements BuildResultHelper {
-  private static final ImmutableList.Builder<String> startupOptions = ImmutableList.builder();
-  private static final ImmutableList.Builder<String> cmdlineOptions = ImmutableList.builder();
-  @Nullable private final ParsedBepOutput parsedBepOutput;
-
-  public FakeBuildResultHelperBep(
-      ImmutableList<String> startupOptions, ImmutableList<String> cmdlineOptions) {
-    this(startupOptions, cmdlineOptions, null);
-  }
-
-  public FakeBuildResultHelperBep(
-      ImmutableList<String> startupOptions,
-      ImmutableList<String> cmdlineOptions,
-      @Nullable ParsedBepOutput output) {
-    FakeBuildResultHelperBep.startupOptions.addAll(startupOptions);
-    FakeBuildResultHelperBep.cmdlineOptions.addAll(cmdlineOptions);
-    parsedBepOutput = output;
-  }
-
-  @Override
-  public List<String> getBuildFlags() {
-    return ImmutableList.of();
-  }
-
-  @Override
-  public ParsedBepOutput getBuildOutput(Optional<String> completedBuildId)
-      throws GetArtifactsException {
-    if (parsedBepOutput == null) {
-      throw new GetArtifactsException("Could not get artifacts from null bep");
-    }
-
-    return parsedBepOutput;
-  }
-
-  @Override
-  public BlazeTestResults getTestResults(Optional<String> completedBuildId) {
-    return BlazeTestResults.NO_RESULTS;
-  }
-
-  @Override
-  public BuildFlags getBlazeFlags(Optional<String> completedBuildId) throws GetFlagsException {
-    return new BuildFlags(startupOptions.build(), cmdlineOptions.build());
-  }
-
-  @Override
-  public void close() {}
-}
diff --git a/base/tests/utils/unit/com/google/idea/blaze/base/io/TempFile.java b/base/tests/utils/unit/com/google/idea/blaze/base/io/TempFile.java
new file mode 100644
index 00000000000..c10518cce49
--- /dev/null
+++ b/base/tests/utils/unit/com/google/idea/blaze/base/io/TempFile.java
@@ -0,0 +1,30 @@
+package com.google.idea.blaze.base.io;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.UUID;
+
+public class TempFile {
+  public static File create() {
+    return create(new byte[0]);
+  }
+
+  public static File create(byte[] contents) {
+    return create(UUID.randomUUID().toString(), contents);
+  }
+
+  public static File create(String name, byte[] contents) {
+    try {
+      final var file = File.createTempFile(name, "test");
+
+      final var writer = new FileOutputStream(file);
+      writer.write(contents);
+      writer.close();
+
+      return file;
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}
diff --git a/base/tests/utils/unit/com/google/idea/blaze/base/scope/ErrorCollector.java b/base/tests/utils/unit/com/google/idea/blaze/base/scope/ErrorCollector.java
index e3e02b8e9a8..16dce5bd926 100644
--- a/base/tests/utils/unit/com/google/idea/blaze/base/scope/ErrorCollector.java
+++ b/base/tests/utils/unit/com/google/idea/blaze/base/scope/ErrorCollector.java
@@ -20,7 +20,7 @@
 
 import com.google.common.collect.Lists;
 import com.google.idea.blaze.base.scope.output.IssueOutput;
-import com.google.idea.blaze.base.scope.output.IssueOutput.Category;
+import com.intellij.build.events.MessageEvent.Kind;
 import java.util.List;
 
 /** Test class that collects issues. */
@@ -52,11 +52,11 @@ public void assertNoIssues() {
   }
 
   public void assertHasErrors() {
-    assertThat(issues.stream().anyMatch(i -> i.getCategory() == Category.ERROR)).isTrue();
+    assertThat(issues.stream().anyMatch(i -> i.getKind() == Kind.ERROR)).isTrue();
   }
 
   public void assertHasNoErrors() {
-    assertThat(issues.stream().anyMatch(i -> i.getCategory() == Category.ERROR)).isFalse();
+    assertThat(issues.stream().anyMatch(i -> i.getKind() == Kind.ERROR)).isFalse();
   }
 
   public void assertIssues(String... requiredMessages) {
diff --git a/python/tests/unittests/com/google/idea/blaze/python/issueparser/PyIssueParserProviderTest.java b/python/tests/unittests/com/google/idea/blaze/python/issueparser/PyIssueParserProviderTest.java
index d9e1a74372e..436e8f5079e 100644
--- a/python/tests/unittests/com/google/idea/blaze/python/issueparser/PyIssueParserProviderTest.java
+++ b/python/tests/unittests/com/google/idea/blaze/python/issueparser/PyIssueParserProviderTest.java
@@ -21,16 +21,19 @@
 import com.google.idea.blaze.base.BlazeTestCase;
 import com.google.idea.blaze.base.issueparser.BlazeIssueParser;
 import com.google.idea.blaze.base.issueparser.BlazeIssueParserProvider;
-import com.google.idea.blaze.base.model.primitives.WorkspacePath;
 import com.google.idea.blaze.base.model.primitives.WorkspaceRoot;
 import com.google.idea.blaze.base.scope.output.IssueOutput;
-import com.google.idea.blaze.base.scope.output.IssueOutput.Category;
 import com.google.idea.blaze.base.settings.BlazeImportSettings;
 import com.google.idea.blaze.base.settings.BlazeImportSettings.ProjectType;
 import com.google.idea.blaze.base.settings.BlazeImportSettingsManager;
 import com.google.idea.blaze.base.settings.BuildSystemName;
+import com.intellij.build.events.MessageEvent.Kind;
 import com.intellij.openapi.extensions.impl.ExtensionPointImpl;
-import com.intellij.openapi.util.TextRange;
+import com.intellij.openapi.vfs.VirtualFileManager;
+import com.intellij.openapi.vfs.VirtualFileManagerListener;
+import com.intellij.openapi.vfs.impl.VirtualFileManagerImpl;
+import com.intellij.openapi.vfs.local.CoreLocalFileSystem;
+import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -59,6 +62,9 @@ protected void initTest(Container applicationServices, Container projectServices
     ep.registerExtension(new PyIssueParserProvider());
 
     parsers = ImmutableList.copyOf(BlazeIssueParserProvider.getAllIssueParsers(project));
+
+    registerExtensionPointByName("com.intellij.virtualFileManagerListener", VirtualFileManagerListener.class);
+    applicationServices.register(VirtualFileManager.class, new VirtualFileManagerImpl(List.of(new CoreLocalFileSystem())));
   }
 
   @Test
@@ -69,20 +75,6 @@ public void testParsePyTypeError() {
             "File \"dataset.py\", line 109, in Dataset: "
                 + "Name 'function' is not defined [name-error]");
     assertThat(issue).isNotNull();
-    assertThat(issue.getCategory()).isEqualTo(Category.ERROR);
-    assertThat(issue.getNavigatable()).isNotNull();
-    assertThat(issue.getConsoleHyperlinkRange())
-        .isEqualTo(TextRange.create("File \"".length(), "File \"dataset.py\", line 109".length()));
-  }
-
-  @Test
-  public void testParseWorkspaceRelativePath() {
-    BlazeIssueParser blazeIssueParser = new BlazeIssueParser(parsers);
-    IssueOutput issue =
-        blazeIssueParser.parseIssue(
-            "File \"path/to/file.py\", line 109, in File: "
-                + "Name 'function' is not defined [name-error]");
-    assertThat(issue.getFile()).isEqualTo(ROOT.fileForPath(new WorkspacePath("path/to/file.py")));
-    assertThat(issue.getLine()).isEqualTo(109);
+    assertThat(issue.getKind()).isEqualTo(Kind.ERROR);
   }
 }

From 311c7d9ca34dc1b13bf86fe7a61cff6a46b74ea4 Mon Sep 17 00:00:00 2001
From: Daniel Brauner <daniel.brauner@jetbrains.com>
Date: Mon, 23 Sep 2024 13:21:02 +0200
Subject: [PATCH 09/17] fixed ijwb tests

---
 .../command/buildresult/BuildResultHelper.kt  | 12 +++++++++++
 .../run/BlazeGoRunConfigurationRunner.java    |  4 +---
 .../java/fastbuild/FastBuildServiceImpl.java  |  4 +---
 .../run/hotswap/ClassFileManifestBuilder.java |  4 +---
 .../FastBuildCompilerFactoryImplTest.java     | 15 +++++++++++---
 .../source/SourceDirectoryCalculatorTest.java |  7 +++++++
 .../GenerateDeployableJarTaskProvider.java    |  4 +---
 .../testing/BlazeTestSystemProperties.java    | 20 ++++---------------
 8 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/base/src/com/google/idea/blaze/base/command/buildresult/BuildResultHelper.kt b/base/src/com/google/idea/blaze/base/command/buildresult/BuildResultHelper.kt
index 9b474bb0451..00d7f33e81a 100644
--- a/base/src/com/google/idea/blaze/base/command/buildresult/BuildResultHelper.kt
+++ b/base/src/com/google/idea/blaze/base/command/buildresult/BuildResultHelper.kt
@@ -15,6 +15,7 @@
  */
 package com.google.idea.blaze.base.command.buildresult
 
+import com.google.common.collect.ImmutableList
 import com.google.common.collect.ImmutableSet
 import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.BuildEvent
 import com.google.idea.blaze.base.command.buildresult.BuildEventStreamProvider.BuildEventStreamException
@@ -107,6 +108,17 @@ class BuildResultHelper(val outputFile: File) : AutoCloseable {
     return getBuildOutput().getDirectArtifactsForTarget(target, pathFilter)
   }
 
+  /**
+   * Returns all build artifacts belonging to the given output groups.
+   */
+  @Throws(GetArtifactsException::class)
+  fun getArtifactsForOutputGroup(
+    outputGroup: String,
+    pathFilter: Predicate<String>,
+  ): ImmutableList<OutputArtifact> {
+    return getBuildOutput().getOutputGroupArtifacts(outputGroup, pathFilter)
+  }
+
   override fun close() {
     deleteTemporaryOutputFiles()
   }
diff --git a/golang/src/com/google/idea/blaze/golang/run/BlazeGoRunConfigurationRunner.java b/golang/src/com/google/idea/blaze/golang/run/BlazeGoRunConfigurationRunner.java
index 2f1ce2cc197..d22144eb465 100644
--- a/golang/src/com/google/idea/blaze/golang/run/BlazeGoRunConfigurationRunner.java
+++ b/golang/src/com/google/idea/blaze/golang/run/BlazeGoRunConfigurationRunner.java
@@ -33,7 +33,6 @@
 import com.google.idea.blaze.base.command.BlazeInvocationContext;
 import com.google.idea.blaze.base.command.buildresult.BuildResultHelper;
 import com.google.idea.blaze.base.command.buildresult.BuildResultHelper.GetArtifactsException;
-import com.google.idea.blaze.base.command.buildresult.BuildResultHelperProvider;
 import com.google.idea.blaze.base.command.buildresult.LocalFileArtifact;
 import com.google.idea.blaze.base.command.info.BlazeInfo;
 import com.google.idea.blaze.base.io.FileOperationProvider;
@@ -289,8 +288,7 @@ private static ExecutableInfo getExecutableToDebug(ExecutionEnvironment env)
     SaveUtil.saveAllFiles();
     // Explicitly create local build helper, because the debuggable script is expected to be present
     // locally
-    try (BuildResultHelper buildResultHelper =
-        BuildResultHelperProvider.createForLocalBuild(project)) {
+    try (final var buildResultHelper = new BuildResultHelper()) {
       ImmutableList.Builder<String> flags = ImmutableList.builder();
       if (Blaze.getBuildSystemName(project) == BuildSystemName.Blaze) {
         // $ go tool compile
diff --git a/java/src/com/google/idea/blaze/java/fastbuild/FastBuildServiceImpl.java b/java/src/com/google/idea/blaze/java/fastbuild/FastBuildServiceImpl.java
index 24e4ceb0de9..d793701b655 100644
--- a/java/src/com/google/idea/blaze/java/fastbuild/FastBuildServiceImpl.java
+++ b/java/src/com/google/idea/blaze/java/fastbuild/FastBuildServiceImpl.java
@@ -36,7 +36,6 @@
 import com.google.idea.blaze.base.command.BlazeInvocationContext;
 import com.google.idea.blaze.base.command.buildresult.BuildResultHelper;
 import com.google.idea.blaze.base.command.buildresult.BuildResultHelper.GetArtifactsException;
-import com.google.idea.blaze.base.command.buildresult.BuildResultHelperProvider;
 import com.google.idea.blaze.base.command.buildresult.LocalFileArtifact;
 import com.google.idea.blaze.base.command.info.BlazeInfo;
 import com.google.idea.blaze.base.command.info.BlazeInfoRunner;
@@ -260,8 +259,7 @@ private ListenableFuture<FastBuildState.BuildOutput> buildDeployJarAsync(
               protected BuildOutput execute(BlazeContext context1) {
                 // Explicitly depend on local build helper because the deploy jar is expected to
                 // be available locally
-                try (BuildResultHelper buildResultHelper =
-                    BuildResultHelperProvider.createForLocalBuild(project)) {
+                try (final var buildResultHelper = new BuildResultHelper()) {
                   return buildDeployJar(context1, label, buildParameters, buildResultHelper);
                 }
               }
diff --git a/java/src/com/google/idea/blaze/java/run/hotswap/ClassFileManifestBuilder.java b/java/src/com/google/idea/blaze/java/run/hotswap/ClassFileManifestBuilder.java
index 46a052a4331..7f93f2e700a 100644
--- a/java/src/com/google/idea/blaze/java/run/hotswap/ClassFileManifestBuilder.java
+++ b/java/src/com/google/idea/blaze/java/run/hotswap/ClassFileManifestBuilder.java
@@ -23,7 +23,6 @@
 import com.google.idea.blaze.base.command.BlazeInvocationContext;
 import com.google.idea.blaze.base.command.buildresult.BuildResultHelper;
 import com.google.idea.blaze.base.command.buildresult.BuildResultHelper.GetArtifactsException;
-import com.google.idea.blaze.base.command.buildresult.BuildResultHelperProvider;
 import com.google.idea.blaze.base.command.buildresult.LocalFileArtifact;
 import com.google.idea.blaze.base.model.BlazeProjectData;
 import com.google.idea.blaze.base.model.BlazeVersionData;
@@ -101,8 +100,7 @@ public static ClassFileManifest.Diff buildManifest(
     SaveUtil.saveAllFiles();
     // Explicitly create a local build helper because the logic below assumes the JARs to be present
     // locally
-    try (BuildResultHelper buildResultHelper =
-        BuildResultHelperProvider.createForLocalBuild(project)) {
+    try (final var buildResultHelper = new BuildResultHelper()) {
 
       ListenableFuture<BuildResult> buildOperation =
           BlazeBeforeRunCommandHelper.runBlazeCommand(
diff --git a/java/tests/unittests/com/google/idea/blaze/java/fastbuild/FastBuildCompilerFactoryImplTest.java b/java/tests/unittests/com/google/idea/blaze/java/fastbuild/FastBuildCompilerFactoryImplTest.java
index e0f88bc37ea..069df2feeba 100644
--- a/java/tests/unittests/com/google/idea/blaze/java/fastbuild/FastBuildCompilerFactoryImplTest.java
+++ b/java/tests/unittests/com/google/idea/blaze/java/fastbuild/FastBuildCompilerFactoryImplTest.java
@@ -21,6 +21,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.idea.blaze.base.BlazeTestCase;
 import com.google.idea.blaze.base.model.BlazeProjectData;
 import com.google.idea.blaze.base.model.MockBlazeProjectDataBuilder;
 import com.google.idea.blaze.base.model.MockBlazeProjectDataManager;
@@ -33,6 +34,10 @@
 import com.google.idea.blaze.java.fastbuild.FastBuildBlazeData.JavaInfo;
 import com.google.idea.blaze.java.fastbuild.FastBuildBlazeData.JavaToolchainInfo;
 import com.google.idea.blaze.java.fastbuild.FastBuildCompiler.CompileInstructions;
+import com.intellij.openapi.vfs.VirtualFileManager;
+import com.intellij.openapi.vfs.VirtualFileManagerListener;
+import com.intellij.openapi.vfs.impl.VirtualFileManagerImpl;
+import com.intellij.openapi.vfs.local.CoreLocalFileSystem;
 import java.io.File;
 import java.io.IOException;
 import java.io.StringWriter;
@@ -41,6 +46,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -50,7 +56,7 @@
 
 /** Unit tests for {@link FastBuildCompilerFactoryImpl}. */
 @RunWith(JUnit4.class)
-public final class FastBuildCompilerFactoryImplTest {
+public final class FastBuildCompilerFactoryImplTest extends BlazeTestCase {
 
   private static final String AUTO_VALUE_PROCESSOR =
       "com.google.auto.value.processor.AutoValueProcessor";
@@ -82,8 +88,8 @@ public static void verifyJars() {
     checkState(TRUTH_JAR.exists());
   }
 
-  @Before
-  public void setUp() {
+  @Override
+  protected void initTest(Container applicationServices, Container projectServices) {
     BlazeProjectData projectData =
         MockBlazeProjectDataBuilder.builder()
             .setArtifactLocationDecoder(new MockArtifactLocationDecoder())
@@ -91,6 +97,9 @@ public void setUp() {
     BlazeProjectDataManager projectDataManager = new MockBlazeProjectDataManager(projectData);
     compilerFactory =
         FastBuildCompilerFactoryImpl.createForTest(projectDataManager, FAST_BUILD_JAVAC_JAR);
+
+    registerExtensionPointByName("com.intellij.virtualFileManagerListener", VirtualFileManagerListener.class);
+    applicationServices.register(VirtualFileManager.class, new VirtualFileManagerImpl(List.of(new CoreLocalFileSystem())));
   }
 
   @Test
diff --git a/java/tests/unittests/com/google/idea/blaze/java/sync/source/SourceDirectoryCalculatorTest.java b/java/tests/unittests/com/google/idea/blaze/java/sync/source/SourceDirectoryCalculatorTest.java
index 9479a37c554..4eecbf364de 100644
--- a/java/tests/unittests/com/google/idea/blaze/java/sync/source/SourceDirectoryCalculatorTest.java
+++ b/java/tests/unittests/com/google/idea/blaze/java/sync/source/SourceDirectoryCalculatorTest.java
@@ -54,6 +54,10 @@
 import com.google.idea.blaze.java.sync.model.BlazeSourceDirectory;
 import com.google.idea.common.experiments.ExperimentService;
 import com.google.idea.common.experiments.MockExperimentService;
+import com.intellij.openapi.vfs.VirtualFileManager;
+import com.intellij.openapi.vfs.VirtualFileManagerListener;
+import com.intellij.openapi.vfs.impl.VirtualFileManagerImpl;
+import com.intellij.openapi.vfs.local.CoreLocalFileSystem;
 import java.io.File;
 import java.util.List;
 import java.util.Map;
@@ -110,6 +114,9 @@ protected void initTest(Container applicationServices, Container projectServices
 
     registerExtensionPoint(JavaLikeLanguage.EP_NAME, JavaLikeLanguage.class)
         .registerExtension(new JavaLikeLanguage.Java());
+
+    registerExtensionPointByName("com.intellij.virtualFileManagerListener", VirtualFileManagerListener.class);
+    applicationServices.register(VirtualFileManager.class, new VirtualFileManagerImpl(List.of(new CoreLocalFileSystem())));
   }
 
   @Test
diff --git a/scala/src/com/google/idea/blaze/scala/run/producers/GenerateDeployableJarTaskProvider.java b/scala/src/com/google/idea/blaze/scala/run/producers/GenerateDeployableJarTaskProvider.java
index 92574a0964f..5a4f5d0597f 100644
--- a/scala/src/com/google/idea/blaze/scala/run/producers/GenerateDeployableJarTaskProvider.java
+++ b/scala/src/com/google/idea/blaze/scala/run/producers/GenerateDeployableJarTaskProvider.java
@@ -26,7 +26,6 @@
 import com.google.idea.blaze.base.command.BlazeInvocationContext;
 import com.google.idea.blaze.base.command.buildresult.BuildResultHelper;
 import com.google.idea.blaze.base.command.buildresult.BuildResultHelper.GetArtifactsException;
-import com.google.idea.blaze.base.command.buildresult.BuildResultHelperProvider;
 import com.google.idea.blaze.base.command.buildresult.LocalFileArtifact;
 import com.google.idea.blaze.base.console.BlazeConsoleLineProcessorProvider;
 import com.google.idea.blaze.base.issueparser.BlazeIssueParser;
@@ -157,8 +156,7 @@ private static File getDeployableJar(
       RunConfiguration configuration, ExecutionEnvironment env, Label target)
       throws ExecutionException {
     Project project = env.getProject();
-    try (BuildResultHelper buildResultHelper =
-        BuildResultHelperProvider.createForLocalBuild(project)) {
+    try (final var buildResultHelper = new BuildResultHelper()) {
 
       SaveUtil.saveAllFiles();
 
diff --git a/testing/src/com/google/idea/testing/BlazeTestSystemProperties.java b/testing/src/com/google/idea/testing/BlazeTestSystemProperties.java
index 325065d48a2..eee4b8b7546 100644
--- a/testing/src/com/google/idea/testing/BlazeTestSystemProperties.java
+++ b/testing/src/com/google/idea/testing/BlazeTestSystemProperties.java
@@ -15,22 +15,14 @@
  */
 package com.google.idea.testing;
 
-import com.google.common.base.Joiner;
-import com.google.common.collect.Lists;
 import com.google.common.io.Files;
-import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.Application;
 import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.util.BuildNumber;
-import com.intellij.openapi.util.Disposer;
-import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess;
 import com.intellij.util.PlatformUtils;
 import java.io.File;
 import java.io.IOException;
-import java.net.URL;
 import java.nio.charset.StandardCharsets;
-import java.util.Enumeration;
-import java.util.List;
 import javax.annotation.Nullable;
 
 /**
@@ -78,14 +70,10 @@ public static void configureSystemProperties() {
     System.setProperty("user.home", new File(sandbox, "userhome").getAbsolutePath());
 
     // Tests fail if they access files outside of the project roots and other system directories.
-    // Ensure runfiles and platform api are allowed.
-    // Note: We want this access to be true for all tests so we don't dispose the disposable.
-    Disposable disposable = Disposer.newDisposable();
-    VfsRootAccess.allowRootAccess(disposable, RUNFILES_PATH);
-    String platformApi = getPlatformApiPath();
-    if (platformApi != null) {
-      VfsRootAccess.allowRootAccess(disposable, platformApi);
-    }
+    // When the class path contains jars which contain `kotlin` packages the `BuiltinsVirtualFileProviderBaseImpl`
+    // also access jars from the class path. Therefore, this checks needs either to be disabled or
+    // the specific jars need to be added to the `VfsRootAccess` allow list.
+    System.setProperty("NO_FS_ROOTS_ACCESS_CHECK", "true");
 
     setIfEmpty("idea.force.use.core.classloader", "true");
   }

From f83c8fb31b424c6c2c61f14127149a971db69081 Mon Sep 17 00:00:00 2001
From: Daniel Brauner <daniel.brauner@jetbrains.com>
Date: Mon, 23 Sep 2024 18:56:54 +0200
Subject: [PATCH 10/17] improved backwards compatability

---
 .../idea/blaze/base/buildview/BazelService.kt       | 13 +++++++++++--
 .../blaze/base/buildview/events/BazelBuildIssue.kt  |  3 +--
 .../blaze/clwb/base/ClwbIntegrationTestCase.java    |  9 +++++++++
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/base/src/com/google/idea/blaze/base/buildview/BazelService.kt b/base/src/com/google/idea/blaze/base/buildview/BazelService.kt
index 4caeb61932e..ad114225d81 100644
--- a/base/src/com/google/idea/blaze/base/buildview/BazelService.kt
+++ b/base/src/com/google/idea/blaze/base/buildview/BazelService.kt
@@ -13,6 +13,7 @@ import com.intellij.execution.configurations.GeneralCommandLine
 import com.intellij.execution.process.OSProcessHandler
 import com.intellij.execution.process.ProcessEvent
 import com.intellij.execution.process.ProcessListener
+import com.intellij.openapi.Disposable
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
@@ -24,9 +25,10 @@ import com.intellij.util.ui.EDT
 import kotlinx.coroutines.*
 import java.io.FileInputStream
 import java.io.IOException
+import kotlin.io.path.pathString
 
 @Service(Service.Level.PROJECT)
-class BazelService(private val project: Project, private val scope: CoroutineScope) {
+class BazelService(private val project: Project) : Disposable {
   companion object {
     private val LOG: Logger = thisLogger()
 
@@ -34,6 +36,13 @@ class BazelService(private val project: Project, private val scope: CoroutineSco
     fun instance(project: Project): BazelService = project.service()
   }
 
+  // #api223 use the injected scope
+  private val scope: CoroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
+
+  override fun dispose() {
+    scope.cancel()
+  }
+
   private fun assertNonBlocking() {
     LOG.assertTrue(
       !EDT.isCurrentThreadEdt(),
@@ -60,7 +69,7 @@ class BazelService(private val project: Project, private val scope: CoroutineSco
     val handler = GeneralCommandLine()
       .withExePath(cmd.binaryPath)
       .withParameters(cmd.toArgumentList())
-      .withWorkingDirectory(root)
+      .apply { setWorkDirectory(root.pathString) } // required for backwards compatability
       .withRedirectErrorStream(true)
       .let(::OSProcessHandler)
 
diff --git a/base/src/com/google/idea/blaze/base/buildview/events/BazelBuildIssue.kt b/base/src/com/google/idea/blaze/base/buildview/events/BazelBuildIssue.kt
index 8c4b4ae4ce9..556f69f512b 100644
--- a/base/src/com/google/idea/blaze/base/buildview/events/BazelBuildIssue.kt
+++ b/base/src/com/google/idea/blaze/base/buildview/events/BazelBuildIssue.kt
@@ -10,7 +10,6 @@ import com.intellij.openapi.fileEditor.OpenFileDescriptor
 import com.intellij.openapi.project.Project
 import com.intellij.pom.Navigatable
 import com.intellij.pom.NavigatableAdapter
-import com.intellij.psi.util.startOffset
 
 data class BazelBuildIssue(
   override val title: String,
@@ -27,7 +26,7 @@ data class BazelBuildIssue(
       val element = BuildReferenceManager.getInstance(project).resolveLabel(label) ?: return
 
       val file = element.containingFile.virtualFile ?: return
-      OpenFileDescriptor(project, file, element.startOffset).navigate(requestFocus)
+      OpenFileDescriptor(project, file, element.textRange.startOffset).navigate(requestFocus)
     }
   }
 
diff --git a/clwb/tests/integrationtests/com/google/idea/blaze/clwb/base/ClwbIntegrationTestCase.java b/clwb/tests/integrationtests/com/google/idea/blaze/clwb/base/ClwbIntegrationTestCase.java
index c660deeec94..7ac8932104f 100644
--- a/clwb/tests/integrationtests/com/google/idea/blaze/clwb/base/ClwbIntegrationTestCase.java
+++ b/clwb/tests/integrationtests/com/google/idea/blaze/clwb/base/ClwbIntegrationTestCase.java
@@ -47,6 +47,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
 import org.intellij.lang.annotations.Language;
 
 public abstract class ClwbIntegrationTestCase extends HeavyPlatformTestCase {
@@ -228,6 +229,14 @@ protected SyncOutput runSync(BlazeSyncParams params) {
     context.close();
     LOG.info(String.format("PROJECT SYNC LOG:%n%s", output.collectLog()));
 
+    try {
+      future.get();
+    } catch (ExecutionException e) {
+      fail("sync failed " + e.getMessage());
+    } catch (InterruptedException e) {
+      fail("sync was interrupted");
+    }
+
     return output;
   }
 

From 1b92c66a3bb85776587af476c9176f83db264767 Mon Sep 17 00:00:00 2001
From: Daniel Brauner <daniel.brauner@jetbrains.com>
Date: Mon, 30 Sep 2024 10:55:00 +0200
Subject: [PATCH 11/17] added progress indicator

---
 .../idea/blaze/base/buildview/BuildViewScope.kt   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/base/src/com/google/idea/blaze/base/buildview/BuildViewScope.kt b/base/src/com/google/idea/blaze/base/buildview/BuildViewScope.kt
index bf58cb72be8..41f4c741ee1 100644
--- a/base/src/com/google/idea/blaze/base/buildview/BuildViewScope.kt
+++ b/base/src/com/google/idea/blaze/base/buildview/BuildViewScope.kt
@@ -18,6 +18,8 @@ import com.intellij.icons.AllIcons
 import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.progress.impl.BackgroundableProcessIndicator
+import com.intellij.openapi.progress.util.AbstractProgressIndicatorExBase
 import com.intellij.openapi.project.Project
 import java.util.function.Consumer
 
@@ -28,10 +30,19 @@ class BuildViewScope(project: Project, private val title: String) : BlazeScope {
   }
 
   private var progress = SyncViewManager.createBuildProgress(project)
+  private var indicator = BackgroundableProcessIndicator(project, title, "Cancel", "Cancel", true)
 
   override fun onScopeBegin(ctx: BlazeContext) {
     progress.start(ProgressDescriptor(title, ctx))
 
+    indicator.addStateDelegate(object : AbstractProgressIndicatorExBase() {
+      override fun cancel() {
+        super.cancel()
+        ctx.setCancelled()
+      }
+    })
+    indicator.start()
+
     addOutputSink<PrintOutput>(ctx) {
       progress.output(it.text + '\n', true)
     }
@@ -58,9 +69,13 @@ class BuildViewScope(project: Project, private val title: String) : BlazeScope {
       ctx.hasErrors() -> progress.fail()
       else -> progress.finish()
     }
+
+    indicator.stop()
+    indicator.processFinish()
   }
 
   fun startProgress(title: String): BuildProgress<BuildProgressDescriptor>? {
+    indicator.text2 = title
     return progress?.progress(title)
   }
 }

From 8ef83ebf0e6d373a223f1b76d9e8f5df43f7ae63 Mon Sep 17 00:00:00 2001
From: Daniel Brauner <daniel.brauner@jetbrains.com>
Date: Mon, 30 Sep 2024 10:58:14 +0200
Subject: [PATCH 12/17] fixed invalid protocol buffer exception due to end of
 input

---
 base/src/com/google/idea/blaze/base/buildview/BazelService.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base/src/com/google/idea/blaze/base/buildview/BazelService.kt b/base/src/com/google/idea/blaze/base/buildview/BazelService.kt
index ad114225d81..96acd270ae7 100644
--- a/base/src/com/google/idea/blaze/base/buildview/BazelService.kt
+++ b/base/src/com/google/idea/blaze/base/buildview/BazelService.kt
@@ -101,7 +101,7 @@ class BazelService(private val project: Project) : Disposable {
       // wait for bazel to create the output file
       while (!helper.outputFile.exists()) delay(10)
 
-      FileInputStream(helper.outputFile).use { stream ->
+      FileInputStream(helper.outputFile).buffered().use { stream ->
 
         // keep reading events while the coroutine is active i.e. bazel is still running
         // or while the stream has data available (to ensure that all events are processed)

From 11b4da2010c4559a55594a5f4d40691206d6b2ab Mon Sep 17 00:00:00 2001
From: Daniel Brauner <daniel.brauner@jetbrains.com>
Date: Wed, 2 Oct 2024 10:51:23 +0200
Subject: [PATCH 13/17] fixes kotlin configuration deadlock

---
 .../async/executor/ProgressIndicatorStub.kt   |  2 +-
 .../kotlin/sync/BlazeKotlinSyncPlugin.java    | 42 ++++++++++---------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/base/src/com/google/idea/blaze/base/async/executor/ProgressIndicatorStub.kt b/base/src/com/google/idea/blaze/base/async/executor/ProgressIndicatorStub.kt
index cb3f271855b..fa24de52e9a 100644
--- a/base/src/com/google/idea/blaze/base/async/executor/ProgressIndicatorStub.kt
+++ b/base/src/com/google/idea/blaze/base/async/executor/ProgressIndicatorStub.kt
@@ -34,7 +34,7 @@ object ProgressIndicatorStub : ProgressIndicatorEx {
 
   override fun isModal(): Boolean { return false }
 
-  override fun getModalityState(): ModalityState { return ModalityState.defaultModalityState() }
+  override fun getModalityState(): ModalityState { return ModalityState.NON_MODAL /* required for backwards compatability */ }
 
   override fun setModalityProgress(p0: ProgressIndicator?) { }
 
diff --git a/kotlin/src/com/google/idea/blaze/kotlin/sync/BlazeKotlinSyncPlugin.java b/kotlin/src/com/google/idea/blaze/kotlin/sync/BlazeKotlinSyncPlugin.java
index 907b824570f..2847370bba1 100644
--- a/kotlin/src/com/google/idea/blaze/kotlin/sync/BlazeKotlinSyncPlugin.java
+++ b/kotlin/src/com/google/idea/blaze/kotlin/sync/BlazeKotlinSyncPlugin.java
@@ -20,6 +20,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.idea.blaze.base.async.executor.ProgressIndicatorStub;
 import com.google.idea.blaze.base.ideinfo.KotlinToolchainIdeInfo;
 import com.google.idea.blaze.base.model.BlazeProjectData;
 import com.google.idea.blaze.base.model.BlazeVersionData;
@@ -44,6 +45,7 @@
 import com.intellij.openapi.application.ReadAction;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleManager;
+import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ModifiableRootModel;
 import com.intellij.pom.java.LanguageLevel;
@@ -326,31 +328,33 @@ public void afterSync(
           KotlinJavaModuleConfigurator.Companion.getInstance();
       NotificationMessageCollector collector =
           new NotificationMessageCollector(project, "Configuring Kotlin", "Configuring Kotlin");
-      Application application = ApplicationManager.getApplication();
 
-      application.invokeAndWait(
-          () -> {
-            configurator.getOrCreateKotlinLibrary(project, collector);
-          });
-
-      List<Function0<Unit>> writeActions = new ArrayList<>();
-      application.runReadAction(
-          () -> {
-            configurator.configureModule(workspaceModule, collector, writeActions);
-          });
-
-      if (ApplicationManager.getApplication().isUnitTestMode()) {
-        // do not invoke it later since serviceContainer may be disposed before it get completed
+      ProgressManager.getInstance().runProcess(() -> {
+        Application application = ApplicationManager.getApplication();
         application.invokeAndWait(
             () -> {
-              writeActions.stream().forEach(Function0::invoke);
+              configurator.getOrCreateKotlinLibrary(project, collector);
             });
-      } else {
-        application.invokeLater(
+
+        List<Function0<Unit>> writeActions = new ArrayList<>();
+        application.runReadAction(
             () -> {
-              writeActions.stream().forEach(Function0::invoke);
+              configurator.configureModule(workspaceModule, collector, writeActions);
             });
-      }
+
+        if (ApplicationManager.getApplication().isUnitTestMode()) {
+          // do not invoke it later since serviceContainer may be disposed before it get completed
+          application.invokeAndWait(
+              () -> {
+                writeActions.stream().forEach(Function0::invoke);
+              });
+        } else {
+          application.invokeLater(
+              () -> {
+                writeActions.stream().forEach(Function0::invoke);
+              });
+        }
+      }, ProgressIndicatorStub.INSTANCE);
     }
   }
 }

From e6cf441f018027fe36c99c3b253ef8fc026af0f1 Mon Sep 17 00:00:00 2001
From: Daniel Brauner <daniel.brauner@jetbrains.com>
Date: Mon, 7 Oct 2024 13:11:45 +0200
Subject: [PATCH 14/17] improved event parsing

---
 .../idea/blaze/base/buildview/BazelService.kt | 33 ++++++++++++++-----
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/base/src/com/google/idea/blaze/base/buildview/BazelService.kt b/base/src/com/google/idea/blaze/base/buildview/BazelService.kt
index 96acd270ae7..f12a2a4d29b 100644
--- a/base/src/com/google/idea/blaze/base/buildview/BazelService.kt
+++ b/base/src/com/google/idea/blaze/base/buildview/BazelService.kt
@@ -9,6 +9,7 @@ import com.google.idea.blaze.base.model.primitives.WorkspaceRoot
 import com.google.idea.blaze.base.scope.BlazeContext
 import com.google.idea.blaze.base.sync.aspects.BlazeBuildOutputs
 import com.google.idea.blaze.base.sync.aspects.BuildResult
+import com.google.protobuf.CodedInputStream
 import com.intellij.execution.configurations.GeneralCommandLine
 import com.intellij.execution.process.OSProcessHandler
 import com.intellij.execution.process.ProcessEvent
@@ -18,20 +19,19 @@ import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.openapi.diagnostic.Logger
-import com.intellij.openapi.diagnostic.thisLogger
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Key
+import com.intellij.util.io.LimitedInputStream
 import com.intellij.util.ui.EDT
 import kotlinx.coroutines.*
 import java.io.FileInputStream
-import java.io.IOException
 import kotlin.io.path.pathString
 
+private val LOG: Logger = Logger.getInstance(BazelService::class.java)
+
 @Service(Service.Level.PROJECT)
 class BazelService(private val project: Project) : Disposable {
   companion object {
-    private val LOG: Logger = thisLogger()
-
     @JvmStatic
     fun instance(project: Project): BazelService = project.service()
   }
@@ -97,19 +97,34 @@ class BazelService(private val project: Project) : Disposable {
   private fun CoroutineScope.parseEvents(ctx: BlazeContext, helper: BuildResultHelper): Job {
     val handler = CoroutineExceptionHandler { _, e -> LOG.error("error in event parser", e) }
 
-    return launch(handler + CoroutineName("EventParser")) {
+    return launch(handler + CoroutineName("EventParser") + SupervisorJob()) {
       // wait for bazel to create the output file
       while (!helper.outputFile.exists()) delay(10)
 
       FileInputStream(helper.outputFile).buffered().use { stream ->
-
-        // keep reading events while the coroutine is active i.e. bazel is still running
+        // keep reading events while the coroutine is active, i.e. bazel is still running,
         // or while the stream has data available (to ensure that all events are processed)
         while (isActive || stream.available() > 0) {
+
+          // make sure that there are at least four bytes already available
+          while (stream.available() < 4) delay(10)
+
+          // protobuf messages are delimited by size (encoded as varint32),
+          // read size manually to ensure the entire message is already available
+          val size = CodedInputStream.readRawVarint32(stream.read(), stream)
+          while (stream.available() < size) delay(10)
+
+          val eventStream = LimitedInputStream(stream, size)
           val event = try {
-            BuildEvent.parseDelimitedFrom(stream)
-          } catch (e: IOException) {
+            BuildEvent.parseFrom(eventStream)
+          } catch (e: Exception) {
             LOG.error("could not parse event", e)
+
+            // if the message could not be parsed, make sure to skip it
+            if (eventStream.bytesRead < size) {
+              stream.skip(size.toLong() - eventStream.bytesRead)
+            }
+
             continue
           }
 

From 4884aeea11da651ca86880c3ab66f5ae00cd8a5e Mon Sep 17 00:00:00 2001
From: Daniel Brauner <daniel.brauner@jetbrains.com>
Date: Mon, 7 Oct 2024 14:39:20 +0200
Subject: [PATCH 15/17] fixed slow operations exception for target navigation

---
 .../base/buildview/events/BazelBuildIssue.kt  | 14 ++---
 .../general/FileNavigatableCompat.java        | 28 ++++++++++
 .../general/FileNavigatableCompat.java        | 28 ++++++++++
 .../general/FileNavigatableCompat.java        | 52 +++++++++++++++++++
 .../general/FileNavigatableCompat.java        | 52 +++++++++++++++++++
 .../general/FileNavigatableCompat.java        | 52 +++++++++++++++++++
 .../general/FileNavigatableCompat.java        | 52 +++++++++++++++++++
 .../general/FileNavigatableCompat.java        | 52 +++++++++++++++++++
 8 files changed, 323 insertions(+), 7 deletions(-)
 create mode 100644 sdkcompat/v223/com/google/idea/sdkcompat/general/FileNavigatableCompat.java
 create mode 100644 sdkcompat/v231/com/google/idea/sdkcompat/general/FileNavigatableCompat.java
 create mode 100644 sdkcompat/v232/com/google/idea/sdkcompat/general/FileNavigatableCompat.java
 create mode 100644 sdkcompat/v233/com/google/idea/sdkcompat/general/FileNavigatableCompat.java
 create mode 100644 sdkcompat/v241/com/google/idea/sdkcompat/general/FileNavigatableCompat.java
 create mode 100644 sdkcompat/v242/com/google/idea/sdkcompat/general/FileNavigatableCompat.java
 create mode 100644 sdkcompat/v243/com/google/idea/sdkcompat/general/FileNavigatableCompat.java

diff --git a/base/src/com/google/idea/blaze/base/buildview/events/BazelBuildIssue.kt b/base/src/com/google/idea/blaze/base/buildview/events/BazelBuildIssue.kt
index 556f69f512b..011fb1289eb 100644
--- a/base/src/com/google/idea/blaze/base/buildview/events/BazelBuildIssue.kt
+++ b/base/src/com/google/idea/blaze/base/buildview/events/BazelBuildIssue.kt
@@ -4,12 +4,12 @@ package com.google.idea.blaze.base.buildview.events
 
 import com.google.idea.blaze.base.lang.buildfile.references.BuildReferenceManager
 import com.google.idea.blaze.base.lang.buildfile.references.LabelUtils
+import com.google.idea.sdkcompat.general.FileNavigatableCompat
 import com.intellij.build.issue.BuildIssue
 import com.intellij.build.issue.BuildIssueQuickFix
 import com.intellij.openapi.fileEditor.OpenFileDescriptor
 import com.intellij.openapi.project.Project
 import com.intellij.pom.Navigatable
-import com.intellij.pom.NavigatableAdapter
 
 data class BazelBuildIssue(
   override val title: String,
@@ -18,15 +18,15 @@ data class BazelBuildIssue(
   val label: String? = null,
 ) : BuildIssue {
 
-  inner class LabelNavigatable(private val project: Project) : NavigatableAdapter() {
-    override fun navigate(requestFocus: Boolean) {
+  inner class LabelNavigatable(private val project: Project) : FileNavigatableCompat() {
+    override fun findFileAsync(): OpenFileDescriptor? {
       // TODO: better use `bazel query "label" --output=location` - would be way more accurate ??
 
-      val label = LabelUtils.createLabelFromString(null, label) ?: return
-      val element = BuildReferenceManager.getInstance(project).resolveLabel(label) ?: return
+      val label = LabelUtils.createLabelFromString(null, label) ?: return null
+      val element = BuildReferenceManager.getInstance(project).resolveLabel(label) ?: return null
 
-      val file = element.containingFile.virtualFile ?: return
-      OpenFileDescriptor(project, file, element.textRange.startOffset).navigate(requestFocus)
+      val file = element.containingFile.virtualFile ?: return null
+      return OpenFileDescriptor(project, file, element.textRange.startOffset)
     }
   }
 
diff --git a/sdkcompat/v223/com/google/idea/sdkcompat/general/FileNavigatableCompat.java b/sdkcompat/v223/com/google/idea/sdkcompat/general/FileNavigatableCompat.java
new file mode 100644
index 00000000000..ec242969dc0
--- /dev/null
+++ b/sdkcompat/v223/com/google/idea/sdkcompat/general/FileNavigatableCompat.java
@@ -0,0 +1,28 @@
+package com.google.idea.sdkcompat.general;
+
+import com.intellij.openapi.fileEditor.OpenFileDescriptor;
+import com.intellij.pom.Navigatable;
+import com.intellij.util.SlowOperations;
+import org.jetbrains.annotations.Nullable;
+
+// #api231 - NavigationRequest api was added in 232
+public abstract class FileNavigatableCompat implements Navigatable {
+
+  protected abstract @Nullable OpenFileDescriptor findFileAsync();
+
+  @Override
+  public boolean canNavigate() {
+    return true;
+  }
+
+  @Override
+  public boolean canNavigateToSource() {
+    return true;
+  }
+
+  @Override
+  public void navigate(boolean requestFocus) {
+    final var descriptor = SlowOperations.allowSlowOperations(() -> findFileAsync());
+    descriptor.navigate(requestFocus);
+  }
+}
diff --git a/sdkcompat/v231/com/google/idea/sdkcompat/general/FileNavigatableCompat.java b/sdkcompat/v231/com/google/idea/sdkcompat/general/FileNavigatableCompat.java
new file mode 100644
index 00000000000..ec242969dc0
--- /dev/null
+++ b/sdkcompat/v231/com/google/idea/sdkcompat/general/FileNavigatableCompat.java
@@ -0,0 +1,28 @@
+package com.google.idea.sdkcompat.general;
+
+import com.intellij.openapi.fileEditor.OpenFileDescriptor;
+import com.intellij.pom.Navigatable;
+import com.intellij.util.SlowOperations;
+import org.jetbrains.annotations.Nullable;
+
+// #api231 - NavigationRequest api was added in 232
+public abstract class FileNavigatableCompat implements Navigatable {
+
+  protected abstract @Nullable OpenFileDescriptor findFileAsync();
+
+  @Override
+  public boolean canNavigate() {
+    return true;
+  }
+
+  @Override
+  public boolean canNavigateToSource() {
+    return true;
+  }
+
+  @Override
+  public void navigate(boolean requestFocus) {
+    final var descriptor = SlowOperations.allowSlowOperations(() -> findFileAsync());
+    descriptor.navigate(requestFocus);
+  }
+}
diff --git a/sdkcompat/v232/com/google/idea/sdkcompat/general/FileNavigatableCompat.java b/sdkcompat/v232/com/google/idea/sdkcompat/general/FileNavigatableCompat.java
new file mode 100644
index 00000000000..c144e580301
--- /dev/null
+++ b/sdkcompat/v232/com/google/idea/sdkcompat/general/FileNavigatableCompat.java
@@ -0,0 +1,52 @@
+package com.google.idea.sdkcompat.general;
+
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.fileEditor.OpenFileDescriptor;
+import com.intellij.openapi.util.Computable;
+import com.intellij.platform.backend.navigation.NavigationRequest;
+import com.intellij.platform.backend.navigation.impl.RawNavigationRequest;
+import com.intellij.pom.Navigatable;
+import org.jetbrains.annotations.Nullable;
+
+// #api231 - NavigationRequest api was added in 232
+@SuppressWarnings("UnstableApiUsage")
+public abstract class FileNavigatableCompat implements Navigatable {
+
+  protected abstract @Nullable OpenFileDescriptor findFileAsync();
+
+  @Override
+  public boolean canNavigate() {
+    return true;
+  }
+
+  @Override
+  public boolean canNavigateToSource() {
+    return true;
+  }
+
+  @Override
+  public @Nullable NavigationRequest navigationRequest() {
+    if (!canNavigate()) {
+      return null;
+    }
+
+    final var descriptor = findFileAsync();
+    if (descriptor == null || !descriptor.canNavigate()) {
+      return null;
+    }
+
+    return new RawNavigationRequest(descriptor, descriptor.canNavigateToSource());
+  }
+
+  @Override
+  public void navigate(boolean requestFocus) {
+    final var application = ApplicationManager.getApplication();
+
+    application.executeOnPooledThread(() -> {
+      final var descriptor = application.runReadAction((Computable<OpenFileDescriptor>) this::findFileAsync);
+      if (descriptor != null && descriptor.canNavigate()) {
+        application.invokeLater(() -> descriptor.navigate(requestFocus));
+      }
+    });
+  }
+}
diff --git a/sdkcompat/v233/com/google/idea/sdkcompat/general/FileNavigatableCompat.java b/sdkcompat/v233/com/google/idea/sdkcompat/general/FileNavigatableCompat.java
new file mode 100644
index 00000000000..c144e580301
--- /dev/null
+++ b/sdkcompat/v233/com/google/idea/sdkcompat/general/FileNavigatableCompat.java
@@ -0,0 +1,52 @@
+package com.google.idea.sdkcompat.general;
+
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.fileEditor.OpenFileDescriptor;
+import com.intellij.openapi.util.Computable;
+import com.intellij.platform.backend.navigation.NavigationRequest;
+import com.intellij.platform.backend.navigation.impl.RawNavigationRequest;
+import com.intellij.pom.Navigatable;
+import org.jetbrains.annotations.Nullable;
+
+// #api231 - NavigationRequest api was added in 232
+@SuppressWarnings("UnstableApiUsage")
+public abstract class FileNavigatableCompat implements Navigatable {
+
+  protected abstract @Nullable OpenFileDescriptor findFileAsync();
+
+  @Override
+  public boolean canNavigate() {
+    return true;
+  }
+
+  @Override
+  public boolean canNavigateToSource() {
+    return true;
+  }
+
+  @Override
+  public @Nullable NavigationRequest navigationRequest() {
+    if (!canNavigate()) {
+      return null;
+    }
+
+    final var descriptor = findFileAsync();
+    if (descriptor == null || !descriptor.canNavigate()) {
+      return null;
+    }
+
+    return new RawNavigationRequest(descriptor, descriptor.canNavigateToSource());
+  }
+
+  @Override
+  public void navigate(boolean requestFocus) {
+    final var application = ApplicationManager.getApplication();
+
+    application.executeOnPooledThread(() -> {
+      final var descriptor = application.runReadAction((Computable<OpenFileDescriptor>) this::findFileAsync);
+      if (descriptor != null && descriptor.canNavigate()) {
+        application.invokeLater(() -> descriptor.navigate(requestFocus));
+      }
+    });
+  }
+}
diff --git a/sdkcompat/v241/com/google/idea/sdkcompat/general/FileNavigatableCompat.java b/sdkcompat/v241/com/google/idea/sdkcompat/general/FileNavigatableCompat.java
new file mode 100644
index 00000000000..c144e580301
--- /dev/null
+++ b/sdkcompat/v241/com/google/idea/sdkcompat/general/FileNavigatableCompat.java
@@ -0,0 +1,52 @@
+package com.google.idea.sdkcompat.general;
+
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.fileEditor.OpenFileDescriptor;
+import com.intellij.openapi.util.Computable;
+import com.intellij.platform.backend.navigation.NavigationRequest;
+import com.intellij.platform.backend.navigation.impl.RawNavigationRequest;
+import com.intellij.pom.Navigatable;
+import org.jetbrains.annotations.Nullable;
+
+// #api231 - NavigationRequest api was added in 232
+@SuppressWarnings("UnstableApiUsage")
+public abstract class FileNavigatableCompat implements Navigatable {
+
+  protected abstract @Nullable OpenFileDescriptor findFileAsync();
+
+  @Override
+  public boolean canNavigate() {
+    return true;
+  }
+
+  @Override
+  public boolean canNavigateToSource() {
+    return true;
+  }
+
+  @Override
+  public @Nullable NavigationRequest navigationRequest() {
+    if (!canNavigate()) {
+      return null;
+    }
+
+    final var descriptor = findFileAsync();
+    if (descriptor == null || !descriptor.canNavigate()) {
+      return null;
+    }
+
+    return new RawNavigationRequest(descriptor, descriptor.canNavigateToSource());
+  }
+
+  @Override
+  public void navigate(boolean requestFocus) {
+    final var application = ApplicationManager.getApplication();
+
+    application.executeOnPooledThread(() -> {
+      final var descriptor = application.runReadAction((Computable<OpenFileDescriptor>) this::findFileAsync);
+      if (descriptor != null && descriptor.canNavigate()) {
+        application.invokeLater(() -> descriptor.navigate(requestFocus));
+      }
+    });
+  }
+}
diff --git a/sdkcompat/v242/com/google/idea/sdkcompat/general/FileNavigatableCompat.java b/sdkcompat/v242/com/google/idea/sdkcompat/general/FileNavigatableCompat.java
new file mode 100644
index 00000000000..c144e580301
--- /dev/null
+++ b/sdkcompat/v242/com/google/idea/sdkcompat/general/FileNavigatableCompat.java
@@ -0,0 +1,52 @@
+package com.google.idea.sdkcompat.general;
+
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.fileEditor.OpenFileDescriptor;
+import com.intellij.openapi.util.Computable;
+import com.intellij.platform.backend.navigation.NavigationRequest;
+import com.intellij.platform.backend.navigation.impl.RawNavigationRequest;
+import com.intellij.pom.Navigatable;
+import org.jetbrains.annotations.Nullable;
+
+// #api231 - NavigationRequest api was added in 232
+@SuppressWarnings("UnstableApiUsage")
+public abstract class FileNavigatableCompat implements Navigatable {
+
+  protected abstract @Nullable OpenFileDescriptor findFileAsync();
+
+  @Override
+  public boolean canNavigate() {
+    return true;
+  }
+
+  @Override
+  public boolean canNavigateToSource() {
+    return true;
+  }
+
+  @Override
+  public @Nullable NavigationRequest navigationRequest() {
+    if (!canNavigate()) {
+      return null;
+    }
+
+    final var descriptor = findFileAsync();
+    if (descriptor == null || !descriptor.canNavigate()) {
+      return null;
+    }
+
+    return new RawNavigationRequest(descriptor, descriptor.canNavigateToSource());
+  }
+
+  @Override
+  public void navigate(boolean requestFocus) {
+    final var application = ApplicationManager.getApplication();
+
+    application.executeOnPooledThread(() -> {
+      final var descriptor = application.runReadAction((Computable<OpenFileDescriptor>) this::findFileAsync);
+      if (descriptor != null && descriptor.canNavigate()) {
+        application.invokeLater(() -> descriptor.navigate(requestFocus));
+      }
+    });
+  }
+}
diff --git a/sdkcompat/v243/com/google/idea/sdkcompat/general/FileNavigatableCompat.java b/sdkcompat/v243/com/google/idea/sdkcompat/general/FileNavigatableCompat.java
new file mode 100644
index 00000000000..c144e580301
--- /dev/null
+++ b/sdkcompat/v243/com/google/idea/sdkcompat/general/FileNavigatableCompat.java
@@ -0,0 +1,52 @@
+package com.google.idea.sdkcompat.general;
+
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.fileEditor.OpenFileDescriptor;
+import com.intellij.openapi.util.Computable;
+import com.intellij.platform.backend.navigation.NavigationRequest;
+import com.intellij.platform.backend.navigation.impl.RawNavigationRequest;
+import com.intellij.pom.Navigatable;
+import org.jetbrains.annotations.Nullable;
+
+// #api231 - NavigationRequest api was added in 232
+@SuppressWarnings("UnstableApiUsage")
+public abstract class FileNavigatableCompat implements Navigatable {
+
+  protected abstract @Nullable OpenFileDescriptor findFileAsync();
+
+  @Override
+  public boolean canNavigate() {
+    return true;
+  }
+
+  @Override
+  public boolean canNavigateToSource() {
+    return true;
+  }
+
+  @Override
+  public @Nullable NavigationRequest navigationRequest() {
+    if (!canNavigate()) {
+      return null;
+    }
+
+    final var descriptor = findFileAsync();
+    if (descriptor == null || !descriptor.canNavigate()) {
+      return null;
+    }
+
+    return new RawNavigationRequest(descriptor, descriptor.canNavigateToSource());
+  }
+
+  @Override
+  public void navigate(boolean requestFocus) {
+    final var application = ApplicationManager.getApplication();
+
+    application.executeOnPooledThread(() -> {
+      final var descriptor = application.runReadAction((Computable<OpenFileDescriptor>) this::findFileAsync);
+      if (descriptor != null && descriptor.canNavigate()) {
+        application.invokeLater(() -> descriptor.navigate(requestFocus));
+      }
+    });
+  }
+}

From 001a6a6914498c1a5654338f6a590f8cab326a86 Mon Sep 17 00:00:00 2001
From: Daniel Brauner <daniel.brauner@jetbrains.com>
Date: Mon, 7 Oct 2024 14:39:31 +0200
Subject: [PATCH 16/17] fixed log scope

---
 .../com/google/idea/blaze/base/scope/scopes/IdeaLogScope.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base/src/com/google/idea/blaze/base/scope/scopes/IdeaLogScope.java b/base/src/com/google/idea/blaze/base/scope/scopes/IdeaLogScope.java
index 84ddbdbb08e..d9ad6991be6 100644
--- a/base/src/com/google/idea/blaze/base/scope/scopes/IdeaLogScope.java
+++ b/base/src/com/google/idea/blaze/base/scope/scopes/IdeaLogScope.java
@@ -30,7 +30,7 @@ public class IdeaLogScope implements BlazeScope {
 
   private static final OutputSink<IssueOutput> issueSink =
       (output) -> {
-        logger.warn(output.toString());
+        logger.warn(output.getTitle());
         return OutputSink.Propagation.Continue;
       };
 

From 74f63c426c3a98d56deaec2b75af082652dde170 Mon Sep 17 00:00:00 2001
From: Daniel Brauner <daniel.brauner@jetbrains.com>
Date: Mon, 7 Oct 2024 14:53:43 +0200
Subject: [PATCH 17/17] replaced SupervisorJob with try catch

---
 .../idea/blaze/base/buildview/BazelService.kt | 74 +++++++++++--------
 1 file changed, 42 insertions(+), 32 deletions(-)

diff --git a/base/src/com/google/idea/blaze/base/buildview/BazelService.kt b/base/src/com/google/idea/blaze/base/buildview/BazelService.kt
index f12a2a4d29b..a39d216d25a 100644
--- a/base/src/com/google/idea/blaze/base/buildview/BazelService.kt
+++ b/base/src/com/google/idea/blaze/base/buildview/BazelService.kt
@@ -24,6 +24,7 @@ import com.intellij.openapi.util.Key
 import com.intellij.util.io.LimitedInputStream
 import com.intellij.util.ui.EDT
 import kotlinx.coroutines.*
+import java.io.BufferedInputStream
 import java.io.FileInputStream
 import kotlin.io.path.pathString
 
@@ -94,47 +95,56 @@ class BazelService(private val project: Project) : Disposable {
     return exitCode
   }
 
-  private fun CoroutineScope.parseEvents(ctx: BlazeContext, helper: BuildResultHelper): Job {
-    val handler = CoroutineExceptionHandler { _, e -> LOG.error("error in event parser", e) }
-
-    return launch(handler + CoroutineName("EventParser") + SupervisorJob()) {
-      // wait for bazel to create the output file
-      while (!helper.outputFile.exists()) delay(10)
-
-      FileInputStream(helper.outputFile).buffered().use { stream ->
-        // keep reading events while the coroutine is active, i.e. bazel is still running,
-        // or while the stream has data available (to ensure that all events are processed)
-        while (isActive || stream.available() > 0) {
+  private suspend fun parseEvent(ctx: BlazeContext, stream: BufferedInputStream) {
+    // make sure that there are at least four bytes already available
+    while (stream.available() < 4) delay(10)
 
-          // make sure that there are at least four bytes already available
-          while (stream.available() < 4) delay(10)
+    // protobuf messages are delimited by size (encoded as varint32),
+    // read size manually to ensure the entire message is already available
+    val size = CodedInputStream.readRawVarint32(stream.read(), stream)
+    while (stream.available() < size) delay(10)
 
-          // protobuf messages are delimited by size (encoded as varint32),
-          // read size manually to ensure the entire message is already available
-          val size = CodedInputStream.readRawVarint32(stream.read(), stream)
-          while (stream.available() < size) delay(10)
+    val eventStream = LimitedInputStream(stream, size)
+    val event = try {
+      BuildEvent.parseFrom(eventStream)
+    } catch (e: Exception) {
+      LOG.error("could not parse event", e)
 
-          val eventStream = LimitedInputStream(stream, size)
-          val event = try {
-            BuildEvent.parseFrom(eventStream)
-          } catch (e: Exception) {
-            LOG.error("could not parse event", e)
+      // if the message could not be parsed, make sure to skip it
+      if (eventStream.bytesRead < size) {
+        stream.skip(size.toLong() - eventStream.bytesRead)
+      }
 
-            // if the message could not be parsed, make sure to skip it
-            if (eventStream.bytesRead < size) {
-              stream.skip(size.toLong() - eventStream.bytesRead)
-            }
+      return
+    }
 
-            continue
-          }
+    if (event == null) {
+      delay(10)
+    } else {
+      BuildEventParser.parse(event)?.let(ctx::output)
+    }
+  }
 
-          if (event == null) {
-            delay(10)
-          } else {
-            BuildEventParser.parse(event)?.let(ctx::output)
+  private fun CoroutineScope.parseEvents(ctx: BlazeContext, helper: BuildResultHelper): Job {
+    return launch(CoroutineName("EventParser")) {
+      try {
+        // wait for bazel to create the output file
+        while (!helper.outputFile.exists()) delay(10)
+
+        FileInputStream(helper.outputFile).buffered().use { stream ->
+          // keep reading events while the coroutine is active, i.e. bazel is still running,
+          // or while the stream has data available (to ensure that all events are processed)
+          while (isActive || stream.available() > 0) {
+            parseEvent(ctx, stream)
           }
         }
       }
+      catch (e: CancellationException) {
+        throw e
+      }
+      catch (e: Exception) {
+        LOG.error("error in event parser", e)
+      }
     }
   }