Fix Windows by handling Url paths correctly. #136
+46
−41
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
Previous implementation was mixing Url paths with file paths. It caused errors like: "Error: `file:///C:/work/bazel_plain/sample.bzl` could not be converted back to a URL\n" More: cameron-martin/bazel-lsp#62 The Url.path() is usually `"/" + path to file` which works fine as file path under unix-like systems, but breaks under Windows, where it can be e.g. "/c:/some/file". See https://en.wikipedia.org/wiki/Uniform_Resource_Identifier#syntax Switched to using Url.to_file_path() which represents actual file path. In the process: - Enabled back Windows tests that at least for my machine started passing; - In validate() function not converting from Url to LspUrl and back, just returning to client Url passed in the request.
facebook-github-bot
added
the
CLA Signed
ndmitchell
approved these changes
Dec 2, 2024
| // Converts PathBuf to string that can be used in starlark load statements. | ||
| // Performs simple string quoting by replacing \ with \\ (for windows paths). | ||
| fn path_buf_to_load_string(p: &PathBuf) -> String { | ||
| p.to_str().unwrap().replace("\\", "\\\\") |
There was a problem hiding this comment.
Would \ to / not be a simpler thing to do? Also I think you can do \\ for the first argument to get a more efficient replacement.
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.
Previous implementation was using
Url.path()where it should useUrl.to_file_path()It caused errors like:
More: cameron-martin/bazel-lsp#62
The
Url.path()is usually"/" + path to filewhich works fine as file path under unix-like systems, but breaks under Windows, where it can be e.g."/c:/some/file". Seehttps://en.wikipedia.org/wiki/Uniform_Resource_Identifier#syntax
Switched to using
Url.to_file_path()which represents actual file path.In the process: