[fix] fix the @@ prefix issue if bazel.module and WORKSPACE are used together
#534
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tgodzik
force-pushed
the
fix-bazelmod
branch
6 times, most recently
from
7a11ce9
to
6818f50
Compare
|
Ok, so this should be much safer. I don't do any assumptions here about @ or @@. Instead I decided to allow both as both are possible within a single workspace. |
tgodzik
commented
Mar 1, 2024
server/src/main/kotlin/org/jetbrains/bsp/bazel/server/sync/ProjectResolver.kt
Show resolved
Hide resolved
abrams27
reviewed
Mar 5, 2024
bazelrunner/src/main/kotlin/org/jetbrains/bsp/bazel/bazelrunner/BazelInfo.kt
Outdated
Show resolved
Hide resolved
bazelrunner/src/main/kotlin/org/jetbrains/bsp/bazel/bazelrunner/BazelInfo.kt
Outdated
Show resolved
Hide resolved
server/src/main/kotlin/org/jetbrains/bsp/bazel/server/sync/ProjectResolver.kt
Show resolved
Hide resolved
|
I confirmed it just in case on the private repository I am working on and it seems to work alright. I also rebased the PR, which seems to have made the CI issue go away. |
abrams27
changed the title
bazel.module and WORKSPACE are used together
abrams27
changed the title
bazel.module and WORKSPACE are used together@@ prefix issue if bazel.module and WORKSPACE are used together
|
Thanks for taking a look at it! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Second attempt, this time I changed it to looks for the actual @@ or @ label to be available.