mirror of https://github.com/helix-editor/helix
9d1adccf62
This commit addresses an issue where Helix could open duplicate tabs for
the same file if that file was accessed via a symlinked path and an LSP
server (e.g., pyright) returned a fully resolved (canonical) path for
"go to definition" or similar actions. This was particularly problematic
when the entire workspace root was under a symlink.
I've implemented the following changes:
1. **Canonicalize LSP Client Root URIs (`helix-lsp`):**
- I modified `helix-lsp/src/lib.rs` (specifically `find_lsp_workspace`
and `start_client`) and `helix-lsp/src/client.rs`
(`Client::try_add_doc`) to ensure that the LSP client's
`root_path`, `root_uri`, and `workspace_folders` are stored in
their fully canonicalized (symlink-resolved) forms. This ensures
the LSP client operates with a canonical understanding of its
workspace root(s).
2. **Canonicalize Incoming LSP URIs (`helix-core`):**
- I modified `helix-core/src/uri.rs` in the `convert_url_to_uri`
function. When a `url::Url` with a `file://` scheme is converted
to a `Uri::File`, the path is now processed using
`helix_stdx::path::canonicalize` instead of
`helix_stdx::path::normalize`. This ensures URIs from LSP messages
are also in canonical form.
3. **Verified Document Path Storage (`helix-view`):**
- I confirmed that `Document::set_path` (in `helix-view/src/document.rs`)
already uses `helix_stdx::path::canonicalize`. This means
`Document` objects store their paths canonically.
4. **Verified URI Comparisons (`helix-view`):**
- I confirmed that lookups like `Editor::document_by_path` (in
`helix-view/src/editor.rs`) correctly compare canonical paths,
which, due to the above changes, should ensure consistent matching.
These changes collectively ensure that paths/URIs from different sources
(your input, LSP client configuration, LSP messages) are all resolved to
their canonical forms before comparison or use in lookups, preventing
the erroneous opening of duplicate buffers for symlinked files.
I wrote an integration test (`lsp_goto_definition_symlinked_workspace` in
`helix-term/tests/symlink_lsp_workspace_test.rs`) to
specifically cover the symlinked workspace root scenario. However,
persistent compilation timeouts in the testing environment prevented
this test from being run and validated.
|
||
|---|---|---|
| .. | ||
| src | ||
| Cargo.toml | ||