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

minimize the API

Browse Source
This commit is contained in:
Aleksey Kladov 2019-04-11 15:58:00 +03:00
parent b6809b6695
commit 07cc047b4f
2 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
crates/ra_hir/src/source_binder.rs
View File

@ -261,7 +261,8 @@ fn try_get_resolver_for_node(
} }
} }
/// `SourceAnalyzer` /// `SourceAnalyzer` is a convenience wrapper which exposes HIR API in terms of
/// original source files. It should not be used inside the HIR itself.
#[derive(Debug)] #[derive(Debug)]
pub struct SourceAnalyzer { pub struct SourceAnalyzer {
resolver: Resolver, resolver: Resolver,
@ -274,7 +275,7 @@ pub enum PathResolution {
/// An item /// An item
Def(crate::ModuleDef), Def(crate::ModuleDef),
/// A local binding (only value namespace) /// A local binding (only value namespace)
LocalBinding(crate::expr::PatId), LocalBinding(Either<AstPtr<ast::Pat>, AstPtr<ast::SelfParam>>),
/// A generic parameter /// A generic parameter
GenericParam(u32), GenericParam(u32),
SelfType(crate::ImplBlock), SelfType(crate::ImplBlock),
@ -332,25 +333,14 @@ impl SourceAnalyzer {
let hir_path = crate::Path::from_ast(path)?; let hir_path = crate::Path::from_ast(path)?;
let res = self.resolver.resolve_path(db, &hir_path); let res = self.resolver.resolve_path(db, &hir_path);
let res = res.clone().take_types().or_else(|| res.take_values())?; let res = res.clone().take_types().or_else(|| res.take_values())?;
Some(res.into()) let res = match res {
}
pub fn pat_syntax(
&self,
_db: &impl HirDatabase,
pat: crate::expr::PatId,
) -> Option<Either<AstPtr<ast::Pat>, AstPtr<ast::SelfParam>>> {
self.body_source_map.as_ref()?.pat_syntax(pat)
}
}
impl From<crate::Resolution> for PathResolution {
fn from(res: crate::Resolution) -> PathResolution {
match res {
crate::Resolution::Def(it) => PathResolution::Def(it), crate::Resolution::Def(it) => PathResolution::Def(it),
crate::Resolution::LocalBinding(it) => PathResolution::LocalBinding(it), crate::Resolution::LocalBinding(it) => {
PathResolution::LocalBinding(self.body_source_map.as_ref()?.pat_syntax(it)?)
}
crate::Resolution::GenericParam(it) => PathResolution::GenericParam(it), crate::Resolution::GenericParam(it) => PathResolution::GenericParam(it),
crate::Resolution::SelfType(it) => PathResolution::SelfType(it), crate::Resolution::SelfType(it) => PathResolution::SelfType(it),
} };
Some(res)
} }
} }

6
crates/ra_ide_api/src/goto_definition.rs
View File

@ -90,10 +90,8 @@ pub(crate) fn reference_definition(
match resolved { match resolved {
hir::PathResolution::Def(def) => return Exact(NavigationTarget::from_def(db, def)), hir::PathResolution::Def(def) => return Exact(NavigationTarget::from_def(db, def)),
hir::PathResolution::LocalBinding(pat) => { hir::PathResolution::LocalBinding(pat) => {
if let Some(pat) = analyzer.pat_syntax(db, pat) { let nav = NavigationTarget::from_pat(db, file_id, pat);
let nav = NavigationTarget::from_pat(db, file_id, pat); return Exact(nav);
return Exact(nav);
}
} }
hir::PathResolution::GenericParam(..) => { hir::PathResolution::GenericParam(..) => {
// FIXME: go to the generic param def // FIXME: go to the generic param def