itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 11:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor

Browse Source
This commit is contained in:
Aleksey Kladov 2020-08-25 12:47:36 +02:00
parent 4f91478e50
commit 663749beab
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
crates/hir/src/doc_links.rs
View File

@ -2,12 +2,12 @@
use std::iter::once; use std::iter::once;
use hir_def::{db::DefDatabase, resolver::Resolver};
use itertools::Itertools; use itertools::Itertools;
use syntax::ast::Path;
use url::Url; use url::Url;
use crate::{db::HirDatabase, Adt, AsName, Crate, Hygiene, ItemInNs, ModPath, ModuleDef}; use crate::{db::HirDatabase, Adt, AsName, Crate, Hygiene, ItemInNs, ModPath, ModuleDef};
use hir_def::{db::DefDatabase, resolver::Resolver};
use syntax::ast::Path;
pub fn resolve_doc_link<T: Resolvable + Clone, D: DefDatabase + HirDatabase>( pub fn resolve_doc_link<T: Resolvable + Clone, D: DefDatabase + HirDatabase>(
db: &D, db: &D,
@ -16,12 +16,9 @@ pub fn resolve_doc_link<T: Resolvable + Clone, D: DefDatabase + HirDatabase>(
link_target: &str, link_target: &str,
) -> Option<(String, String)> { ) -> Option<(String, String)> {
try_resolve_intra(db, definition, link_text, &link_target).or_else(|| { try_resolve_intra(db, definition, link_text, &link_target).or_else(|| {
if let Some(definition) = definition.clone().try_into_module_def() { let definition = definition.clone().try_into_module_def()?;
try_resolve_path(db, &definition, &link_target) try_resolve_path(db, &definition, &link_target)
.map(|target| (target, link_text.to_string())) .map(|target| (target, link_text.to_string()))
} else {
None
}
}) })
} }
@ -57,7 +54,7 @@ fn try_resolve_intra<T: Resolvable, D: DefDatabase + HirDatabase>(
Some(ns @ Namespace::Types) => (resolved.types?.0, ns), Some(ns @ Namespace::Types) => (resolved.types?.0, ns),
Some(ns @ Namespace::Values) => (resolved.values?.0, ns), Some(ns @ Namespace::Values) => (resolved.values?.0, ns),
// FIXME: // FIXME:
Some(Namespace::Macros) => None?, Some(Namespace::Macros) => return None,
}; };
// Get the filepath of the final symbol // Get the filepath of the final symbol