bazel in install update

JetBrains · Feb 10, 2022 · 1a4669d · 1a4669d
1 parent daca08b
commit 1a4669d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/install/src/main/java/org/jetbrains/bsp/bazel/install/Install.java b/install/src/main/java/org/jetbrains/bsp/bazel/install/Install.java
@@ -75,7 +75,7 @@ public static void main(String[] args) throws IOException {
         addJavaClasspath(argv);
         addDebuggerConnection(cmd, argv, projectView);
         argv.add(SERVER_CLASS_NAME);
-        addBazelBinary(cmd, argv);
+        addBazelBinary(cmd, argv, projectView);
         addBazelTargets(cmd, argv);
 
         BspConnectionDetails details = createBspConnectionDetails(argv);
@@ -114,9 +114,11 @@ private static BspConnectionDetails createBspConnectionDetails(List<String> argv
         Constants.SUPPORTED_LANGUAGES);
   }
 
-  private static void addBazelBinary(CommandLine cmd, List<String> argv) {
+  private static void addBazelBinary(CommandLine cmd, List<String> argv, ProjectView projectView) {
     if (cmd.hasOption(BAZEL_SHORT_OPT)) {
       argv.add(cmd.getOptionValue(BAZEL_SHORT_OPT));
+    } else if (projectView.getBazelPath().isPresent()) {
+      argv.add(projectView.getBazelPath().get().getValue());
     } else {
       argv.add(findOnPath("bazel"));
     }