language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 05:15:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix: multi-token mapping aware goto definition

Browse source
This commit is contained in:
zhoufan 2021-09-16 09:44:22 +08:00
parent 959c7ef563
commit ea3535cefc
1 changed files with 55 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

93
crates/ide/src/goto_definition.rs
View file

@ -39,48 +39,65 @@ pub(crate) fn goto_definition(
kind if kind.is_trivia() => 0, kind if kind.is_trivia() => 0,
_ => 1, _ => 1,
})?; })?;
let token = sema.descend_into_macros(original_token.clone()); let tokens = sema.descend_into_macros_many(original_token.clone());
let parent = token.parent()?; let navs = tokens
if let Some(_) = ast::Comment::cast(token.clone()) { .clone()
let (attributes, def) = doc_attributes(&sema, &parent)?; .into_iter()
let (docs, doc_mapping) = attributes.docs_with_rangemap(db)?; .filter_map(|token| {
let (_, link, ns) = let parent = token.parent()?;
extract_definitions_from_docs(&docs).into_iter().find(|&(range, ..)| { if let Some(_) = ast::Comment::cast(token.clone()) {
doc_mapping.map(range).map_or(false, |InFile { file_id, value: range }| { let (attributes, def) = doc_attributes(&sema, &parent)?;
file_id == position.file_id.into() && range.contains(position.offset) let (docs, doc_mapping) = attributes.docs_with_rangemap(db)?;
}) let (_, link, ns) =
})?; extract_definitions_from_docs(&docs).into_iter().find(|&(range, ..)| {
let nav = resolve_doc_path_for_def(db, def, &link, ns)?.try_to_nav(db)?; doc_mapping.map(range).map_or(false, |InFile { file_id, value: range }| {
return Some(RangeInfo::new(original_token.text_range(), vec![nav])); file_id == position.file_id.into() && range.contains(position.offset)
})
})?;
let nav = resolve_doc_path_for_def(db, def, &link, ns)?.try_to_nav(db)?;
return Some(nav);
}
None
})
.collect::<Vec<NavigationTarget>>();
if navs.len() > 0 {
return Some(RangeInfo::new(original_token.text_range(), navs));
} }
let navs = tokens
let navs = match_ast! { .into_iter()
match parent { .filter_map(|token| {
ast::NameRef(name_ref) => { let parent = token.parent()?;
reference_definition(&sema, Either::Right(&name_ref)) let navs = match_ast! {
}, match parent {
ast::Name(name) => { ast::NameRef(name_ref) => {
match NameClass::classify(&sema, &name)? { reference_definition(&sema, Either::Right(&name_ref))
NameClass::Definition(def) | NameClass::ConstReference(def) => {
try_find_trait_item_definition(sema.db, &def).unwrap_or_else(|| def_to_nav(sema.db, def))
}
NameClass::PatFieldShorthand { local_def, field_ref } => {
local_and_field_to_nav(sema.db, local_def, field_ref)
}, },
} ast::Name(name) => {
}, match NameClass::classify(&sema, &name)? {
ast::Lifetime(lt) => if let Some(name_class) = NameClass::classify_lifetime(&sema, &lt) { NameClass::Definition(def) | NameClass::ConstReference(def) => {
match name_class { try_find_trait_item_definition(sema.db, &def).unwrap_or_else(|| def_to_nav(sema.db, def))
NameClass::Definition(def) => def_to_nav(sema.db, def), }
NameClass::PatFieldShorthand { local_def, field_ref } => {
local_and_field_to_nav(sema.db, local_def, field_ref)
},
}
},
ast::Lifetime(lt) => if let Some(name_class) = NameClass::classify_lifetime(&sema, &lt) {
match name_class {
NameClass::Definition(def) => def_to_nav(sema.db, def),
_ => return None,
}
} else {
reference_definition(&sema, Either::Left(&lt))
},
ast::TokenTree(tt) => try_lookup_include_path_or_derive(&sema, tt, token, position.file_id)?,
_ => return None, _ => return None,
} }
} else { };
reference_definition(&sema, Either::Left(&lt)) Some(navs)
}, })
ast::TokenTree(tt) => try_lookup_include_path_or_derive(&sema, tt, token, position.file_id)?, .flatten()
_ => return None, .collect::<Vec<NavigationTarget>>();
}
};
Some(RangeInfo::new(original_token.text_range(), navs)) Some(RangeInfo::new(original_token.text_range(), navs))
} }