mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adding doc and simplifying function

Browse Source
This commit is contained in:
Bruno Ortiz 2023-04-26 22:56:14 -03:00
parent 072f69e4c1
commit 800b3b6323
1 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
crates/rust-analyzer/src/handlers.rs
View File

@ -51,41 +51,50 @@ pub(crate) fn publish_diagnostics(
pub(crate) fn fetch_dependency_list( pub(crate) fn fetch_dependency_list(
state: GlobalStateSnapshot, state: GlobalStateSnapshot,
_params: FetchDependencyListParams, _params: lsp_ext::FetchDependencyListParams,
) -> Result<FetchDependencyListResult> { ) -> Result<lsp_ext::FetchDependencyListResult> {
let crates = state.analysis.fetch_crates()?; let crates = state.analysis.fetch_crates()?;
Ok(FetchDependencyListResult { let crate_infos = crates
crates: crates .into_iter()
.into_iter() .filter_map(|it| {
.filter_map(|it| { let root_file_path = state.file_id_to_file_path(it.root_file_id);
let root_file_path = state.file_id_to_file_path(it.root_file_id); crate_path(it.name.as_ref(), root_file_path).map(|path| CrateInfoResult {
crate_path(it.name.as_ref(), root_file_path).map(|crate_path| CrateInfoResult { name: it.name,
name: it.name, version: it.version,
version: it.version, path: path.to_string(),
path: crate_path.to_string(),
})
}) })
.collect(), })
}) .collect();
Ok(FetchDependencyListResult { crates: crate_infos })
} }
//Thats a best effort to try and find the crate path /// Searches for the directory of a Rust crate with a given name in the directory tree
/// of the root file of that crate.
///
/// # Arguments
///
/// * `crate_name`: The name of the crate to search for. This should be a `Some` value if
/// a crate name has been specified, or `None` if no crate name has been specified.
/// * `root_file_path`: The path to the root file of the crate.
///
/// # Returns
///
/// An `Option` value representing the path to the directory of the crate with the given
/// name, if such a crate is found. If no crate with the given name is found, this function
/// returns `None`.
fn crate_path(crate_name: Option<&String>, root_file_path: VfsPath) -> Option<VfsPath> { fn crate_path(crate_name: Option<&String>, root_file_path: VfsPath) -> Option<VfsPath> {
crate_name.and_then(|crate_name| { crate_name.and_then(|crate_name| {
let mut crate_path = None;
let mut root_path = root_file_path; let mut root_path = root_file_path;
while let Some(path) = root_path.parent() { while let Some(path) = root_path.parent() {
match path.name_and_extension() { if let Some((name, _)) = path.name_and_extension() {
Some((name, _)) => { if name.starts_with(crate_name.as_str()) {
if name.starts_with(crate_name.as_str()) { return Some(path);
crate_path = Some(path);
break;
}
} }
None => break, } else {
break;
} }
root_path = path; root_path = path;
} }
crate_path None
}) })
} }