helix-lsp-types: Replace url::Url type with String wrapper
#11889
+227
−182
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
Internally the LSP client should hold workspace folders as paths. Using URLs for this type is inconvenient (since we compare it to paths) and might cause mismatches because of URLs not being normalized. The URLs must be paths anyways so we can convert these types lazily when we need to send them to a server.
This is a cosmetic change to replace all direct `use`s of the `url::Url` type in the `helix-lsp-types` crate with `use crate::Url;`. It's the same type currently but will diverge in the child commits and this refactor makes that change simpler.
This seems to be a historical artifact in `lsp_types` - we can use a regular `use` statement to pull in the `bitflags!` macro rather than an external crate definition. This fixes rust-analyzer's ability to find the macro at least on rust-analyzer 2024-02-26.
the-mikedavis
added
C-enhancement
the-mikedavis
force-pushed
the
string-lsp-url
branch
from
70eb8b4
to
fd24a19
Compare
These functions return `Result<Self, ()>` in the `url` crate but the result is unnecessary since the functions never return the error branch. We can eliminate the Result to remove some `expect`s in the calling code.
the-mikedavis
force-pushed
the
string-lsp-url
branch
from
fd24a19
to
57a18e2
Compare
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.
This replaces the use of the
url::Urltype with a newtype wrapper around aString. Changing URL type was the original motivation of vendoring/forking thelsp_typescrate in #11355. Theurlcrate is based on the WHATWG spec for URLs which conflicts with the spec that LSP requires - RFC3986. This change uses the RFC3986 reserved characters for encoding paths which should fix some issues like #11888. The parsing and interpretation of the URL as a path is then covered byUrl::try_fromwhich we use ubiquitously since #11486.Fixes #11888