Small Windows fixes (bazelbuild#7535)

* disable curses on windows

* use path objects in BlazeIntellijPluginDeployer to avoid issues on windows

Author: LeFrosch

base/src/com/google/idea/blaze/base/buildview/BazelExecService.kt

@@ -26,6 +26,7 @@ import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Key
 import com.intellij.util.io.LimitedInputStream
+import com.intellij.util.system.OS
 import com.intellij.util.ui.EDT
 import kotlinx.coroutines.*
 import java.io.BufferedInputStream
@@ -63,8 +64,8 @@ class BazelExecService(private val project: Project, private val scope: Coroutin
   }
 
   private suspend fun execute(ctx: BlazeContext, cmdBuilder: BlazeCommand.Builder): Int {
-    // the old sync view does not use a PTY based terminal
-    if (BuildViewMigration.present(ctx)) {
+    // the old sync view does not use a PTY based terminal, and idk why it does not work on windows :c
+    if (BuildViewMigration.present(ctx) && OS.CURRENT != OS.Windows) {
       cmdBuilder.addBlazeFlags("--curses=yes")
     } else {
       cmdBuilder.addBlazeFlags("--curses=no")
@@ -89,7 +90,7 @@ class BazelExecService(private val project: Project, private val scope: Coroutin
 
       handler.addProcessListener(object : ProcessListener {
         override fun onTextAvailable(event: ProcessEvent, outputType: Key<*>) {
-          if (outputType === ProcessOutputTypes.SYSTEM) {
+          if (outputType == ProcessOutputTypes.SYSTEM) {
             ctx.println(event.text)
           } else {
             ctx.output(PrintOutput.process(event.text))

clwb/clwb.bazelproject

@@ -4,7 +4,10 @@ directories:
   -aswb
   -plugin_dev
   -examples
+  -java
+  -golang
   -clwb/tests/projects
+  -testing/test_deps/projects
 
 targets:
   //clwb:all

ijwb/ijwb.bazelproject

@@ -5,6 +5,7 @@ directories:
   -cpp
   -examples
   -ijwb/tests/projects
+  -testing/test_deps/projects
 
 targets:
   //ijwb:ijwb_bazel_dev

plugin_dev/src/com/google/idea/blaze/plugin/run/BlazeIntellijPluginDeployer.java

@@ -35,17 +35,16 @@
 import com.intellij.concurrency.AsyncUtil;
 import com.intellij.execution.ExecutionException;
 import com.intellij.openapi.util.Key;
-import com.intellij.openapi.util.text.StringUtil;
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.Future;
 
@@ -59,7 +58,7 @@ class BlazeIntellijPluginDeployer {
       Key.create(BlazeIntellijPluginDeployer.class.getName());
 
   private final String sandboxHome;
-  private final Map<String, OutputArtifact> buildArtifactsMap = new HashMap<>();
+  private final Map<Path, OutputArtifact> buildArtifactsMap = new HashMap<>();
   private final List<OutputArtifact> deployInfoArtifacts = new ArrayList<>();
   private final Map<OutputArtifact, File> filesToDeploy = Maps.newHashMap();
 
@@ -81,7 +80,7 @@ void buildStarted() {
   void reportBuildComplete(BlazeBuildOutputs.Legacy blazeBuildOutputs) throws GetArtifactsException {
     ImmutableSet<OutputArtifact> buildArtifacts = blazeBuildOutputs.getAllOutputArtifacts();
     buildArtifactsMap.clear();
-    buildArtifacts.forEach(a -> buildArtifactsMap.put(a.getBazelOutRelativePath(), a));
+    buildArtifacts.forEach(a -> buildArtifactsMap.put(a.getArtifactPath(), a));
 
     deployInfoArtifacts.clear();
     deployInfoArtifacts.addAll(
@@ -158,36 +157,34 @@ private ImmutableMap<OutputArtifact, File> getFilesToDeploy(
     for (IntellijPluginDeployInfo deployInfo : deployInfos) {
       for (IntellijPluginDeployFile deployFile : deployInfo.getDeployFilesList()) {
         result.put(
-            getArtifactFromDeployFile(deployFile, buildSystem),
+            getArtifactFromDeployFile(deployFile),
             new File(sandboxPluginDirectory(sandboxHome), deployFile.getDeployLocation()));
       }
       for (IntellijPluginDeployFile deployFile : deployInfo.getJavaAgentDeployFilesList()) {
         result.put(
-            getArtifactFromDeployFile(deployFile, buildSystem),
+            getArtifactFromDeployFile(deployFile),
             new File(sandboxPluginDirectory(sandboxHome), deployFile.getDeployLocation()));
       }
     }
     return result.build();
   }
 
-  private OutputArtifact getArtifactFromDeployFile(
-      IntellijPluginDeployFile deployFile, String buildSystem) throws ExecutionException {
-    String relativePath =
-        buildArtifactsMap.keySet().stream()
-            .filter(
-                key ->
-                    key.endsWith(
-                        StringUtil.trimStart(
-                            deployFile.getExecutionPath(),
-                            String.format("%s-out/", buildSystem.toLowerCase(Locale.ROOT)))))
-            .findAny()
-            .orElseThrow(
-                () ->
-                    new ExecutionException(
-                        String.format(
-                            "Plugin file '%s' not found. Did the build fail?",
-                            deployFile.getExecutionPath())));
-    return buildArtifactsMap.get(relativePath);
+  private OutputArtifact getArtifactFromDeployFile(IntellijPluginDeployFile deployFile) throws ExecutionException {
+    final var fileExecutionPath = Path.of(deployFile.getExecutionPath());
+
+    // trim the first element from the execution path i.e. bazel-out
+    final var fileRelativePath = fileExecutionPath.subpath(1, fileExecutionPath.getNameCount());
+
+    // Find the matching artifact by comparing the end of the path
+    Path matchingPath = buildArtifactsMap.keySet().stream()
+        .filter(key -> key.endsWith(fileRelativePath))
+        .findAny()
+        .orElseThrow(
+            () ->
+                new ExecutionException(
+                    String.format("Plugin file '%s' not found. Did the build fail?", fileExecutionPath)));
+
+    return buildArtifactsMap.get(matchingPath);
   }
 
   private ImmutableSet<File> listJavaAgentFiles(Collection<IntellijPluginDeployInfo> deployInfos) {