language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 14:21:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add target_dir path argument for external_docs and other methods

Browse source
This commit is contained in:
Ddystopia 2023-04-25 19:49:49 +02:00
parent f2d933ecaf
commit c47a34fddc
No known key found for this signature in database
GPG key ID: 109875EC11535212
3 changed files with 36 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/rust-analyzer/src/handlers/request.rs
View file

@ -1539,7 +1539,13 @@ pub(crate) fn handle_open_docs(
let _p = profile::span("handle_open_docs");
let position = from_proto::file_position(&snap, params)?;
let Ok(remote_urls) = snap.analysis.external_docs(position) else { return Ok((None, None)); };
let cargo = match snap.workspaces.get(0) {
Some(ProjectWorkspace::Cargo { cargo, .. }) => Some(cargo),
_ => None,
};
let target_dir =
cargo.and_then(|cargo| Some(cargo.target_directory())).and_then(|p| Some(p.as_os_str()));
let Ok(remote_urls) = snap.analysis.external_docs(position, target_dir) else { return Ok((None, None)); };
let web_url = remote_urls.web_url.and_then(|it| Url::parse(&it).ok());
let local_url = remote_urls.local_url.and_then(|it| Url::parse(&it).ok());