Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-15 09:27:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add an explanatory message when we use the Query fallback

Browse source
This commit is contained in:
DJMcNab 2019-01-13 10:31:37 +00:00
parent a2659abed8
commit a53c5de1fd
2 changed files with 36 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
crates/ra_ide_api/src/goto_definition.rs
View file

@ -13,8 +13,11 @@ pub(crate) fn goto_definition(
let file = db.source_file(position.file_id);
let syntax = file.syntax();
if let Some(name_ref) = find_node_at_offset::<ast::NameRef>(syntax, position.offset) {
let navs = reference_definition(db, position.file_id, name_ref)?;
return Ok(Some(RangeInfo::new(name_ref.syntax().range(), navs)));
let navs = reference_definition(db, position.file_id, name_ref)?.to_vec();
return Ok(Some(RangeInfo::new(
name_ref.syntax().range(),
navs.to_vec(),
)));
}
if let Some(name) = find_node_at_offset::<ast::Name>(syntax, position.offset) {
let navs = ctry!(name_definition(db, position.file_id, name)?);
@ -23,11 +26,27 @@ pub(crate) fn goto_definition(
Ok(None)
}
pub(crate) enum ReferenceResult {
Exact(NavigationTarget),
Approximate(Vec<NavigationTarget>),
}
impl ReferenceResult {
fn to_vec(self) -> Vec<NavigationTarget> {
use self::ReferenceResult::*;
match self {
Exact(target) => vec![target],
Approximate(vec) => vec,
}
}
}
pub(crate) fn reference_definition(
db: &RootDatabase,
file_id: FileId,
name_ref: &ast::NameRef,
) -> Cancelable<Vec<NavigationTarget>> {
) -> Cancelable<ReferenceResult> {
use self::ReferenceResult::*;
if let Some(fn_descr) =
hir::source_binder::function_from_child_node(db, file_id, name_ref.syntax())?
{
@ -35,7 +54,7 @@ pub(crate) fn reference_definition(
// First try to resolve the symbol locally
if let Some(entry) = scope.resolve_local_name(name_ref) {
let nav = NavigationTarget::from_scope_entry(file_id, &entry);
return Ok(vec![nav]);
return Ok(Exact(nav));
};
}
// Then try module name resolution
@ -51,7 +70,7 @@ pub(crate) fn reference_definition(
let resolved = module.resolve_path(db, &path)?;
if let Some(def_id) = resolved.take_types().or(resolved.take_values()) {
if let Some(target) = NavigationTarget::from_def(db, def_id.resolve(db)?)? {
return Ok(vec![target]);
return Ok(Exact(target));
}
}
}
@ -62,7 +81,7 @@ pub(crate) fn reference_definition(
.into_iter()
.map(NavigationTarget::from_symbol)
.collect();
Ok(navs)
Ok(Approximate(navs))
}
fn name_definition(

15
crates/ra_ide_api/src/hover.rs
View file

@ -16,9 +16,16 @@ pub(crate) fn hover(
let mut range = None;
if let Some(name_ref) = find_node_at_offset::<ast::NameRef>(file.syntax(), position.offset) {
let navs = crate::goto_definition::reference_definition(db, position.file_id, name_ref)?;
for nav in navs {
res.extend(doc_text_for(db, nav)?)
use crate::goto_definition::{ReferenceResult::*, reference_definition};
let ref_result = reference_definition(db, position.file_id, name_ref)?;
match ref_result {
Exact(nav) => res.extend(doc_text_for(db, nav)?),
Approximate(navs) => {
res.push("Failed to exactly resolve the symbol. This is probably because rust_analyzer does not yet support glob imports or traits. \nThese methods were found instead:".to_string());
for nav in navs {
res.extend(doc_text_for(db, nav)?)
}
}
}
if !res.is_empty() {
range = Some(name_ref.syntax().range())
@ -34,7 +41,7 @@ pub(crate) fn hover(
file_id: position.file_id,
range: node.range(),
};
res.extend(type_of(db, frange)?);
res.extend(type_of(db, frange)?.map(Into::into));
range = Some(node.range());
};