From eb5df0a90555cf4e99d3332de1f0cbc749d95f0c Mon Sep 17 00:00:00 2001 From: Xuan-Son Trinh Date: Wed, 23 Aug 2023 14:35:31 +0000 Subject: [PATCH] [fix] fixed `resolveOutput` implementation. the current version does not work with Bazel projects having no symlinks like bazel-bin, bazel-out, etc. Merge-request: BAZEL-MR-468 Merged-by: Xuan Son Trinh --- .../jetbrains/bsp/bazel/server/sync/BazelPathsResolver.kt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/server/src/main/java/org/jetbrains/bsp/bazel/server/sync/BazelPathsResolver.kt b/server/src/main/java/org/jetbrains/bsp/bazel/server/sync/BazelPathsResolver.kt index 5af3e781f..a0cd67cb0 100644 --- a/server/src/main/java/org/jetbrains/bsp/bazel/server/sync/BazelPathsResolver.kt +++ b/server/src/main/java/org/jetbrains/bsp/bazel/server/sync/BazelPathsResolver.kt @@ -52,10 +52,7 @@ class BazelPathsResolver(private val bazelInfo: BazelInfo) { .resolve(fileLocation.relativePath) private fun resolveOutput(fileLocation: FileLocation): Path = - bazelInfo - .workspaceRoot - .resolve(fileLocation.rootExecutionPathFragment) - .resolve(fileLocation.relativePath) + Paths.get(bazelInfo.execRoot, fileLocation.rootExecutionPathFragment, fileLocation.relativePath) private fun resolveSource(fileLocation: FileLocation): Path = bazelInfo.workspaceRoot.resolve(fileLocation.relativePath)