bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide/src/doc_links.rs')
-rw-r--r--crates/ide/src/doc_links.rs28
1 files changed, 18 insertions, 10 deletions
diff --git a/crates/ide/src/doc_links.rs b/crates/ide/src/doc_links.rs
index 4b0ecb9cf9..f221985719 100644
--- a/crates/ide/src/doc_links.rs
+++ b/crates/ide/src/doc_links.rs
@@ -64,13 +64,12 @@ pub(crate) fn rewrite_links(db: &RootDatabase, markdown: &str, definition: Defin
// * path-based links: `../../module/struct.MyStruct.html`
// * module-based links (AKA intra-doc links): `super::super::module::MyStruct`
if let Some((target, title)) = rewrite_intra_doc_link(db, definition, target, title) {
- return (None, target, title);
- }
- if let Some(target) = rewrite_url_link(db, definition, target) {
- return (Some(LinkType::Inline), target, title.to_string());
+ (None, target, title)
+ } else if let Some(target) = rewrite_url_link(db, definition, target) {
+ (Some(LinkType::Inline), target, title.to_string())
+ } else {
+ (None, target.to_string(), title.to_string())
}
-
- (None, target.to_string(), title.to_string())
}
});
let mut out = String::new();
@@ -352,8 +351,12 @@ fn get_doc_links(
web_url = join_url(web_url, &file);
local_url = join_url(local_url, &file);
- web_url.as_mut().map(|url| url.set_fragment(frag.as_deref()));
- local_url.as_mut().map(|url| url.set_fragment(frag.as_deref()));
+ if let Some(url) = web_url.as_mut() {
+ url.set_fragment(frag.as_deref())
+ }
+ if let Some(url) = local_url.as_mut() {
+ url.set_fragment(frag.as_deref())
+ }
DocumentationLinks {
web_url: web_url.map(|it| it.into()),
@@ -369,16 +372,21 @@ fn rewrite_intra_doc_link(
) -> Option<(String, String)> {
let (link, ns) = parse_intra_doc_link(target);
+ let (link, anchor) = match link.split_once('#') {
+ Some((new_link, anchor)) => (new_link, Some(anchor)),
+ None => (link, None),
+ };
+
let resolved = resolve_doc_path_for_def(db, def, link, ns)?;
let mut url = get_doc_base_urls(db, resolved, None, None).0?;
- let (_, file, frag) = filename_and_frag_for_def(db, resolved)?;
+ let (_, file, _) = filename_and_frag_for_def(db, resolved)?;
if let Some(path) = mod_path_of_def(db, resolved) {
url = url.join(&path).ok()?;
}
url = url.join(&file).ok()?;
- url.set_fragment(frag.as_deref());
+ url.set_fragment(anchor);
Some((url.into(), strip_prefixes_suffixes(title).to_string()))
}