Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Canonicalize LSP diagnostics path to resolve symlinks and match the document path #7885

Closed
wants to merge 1 commit into from
Closed

Canonicalize LSP diagnostics path to resolve symlinks and match the document path #7885

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions helix-term/src/application.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use arc_swap::{access::Map, ArcSwap};
use futures_util::Stream;
use helix_core::{
diagnostic::{DiagnosticTag, NumberOrString},
path::get_relative_path,
path::{get_canonicalized_path, get_relative_path},
pos_at_coords, syntax, Selection,
};
use helix_lsp::{
Expand Down Expand Up @@ -724,7 +724,11 @@ impl Application {
}
}
Notification::PublishDiagnostics(params) => {
let path = match params.uri.to_file_path() {
let path = match params
.uri
.to_file_path()
.and_then(|path| get_canonicalized_path(&path).map_err(|_| ()))
{
Ok(path) => path,
Err(_) => {
log::error!("Unsupported file URI: {}", params.uri);
Expand Down