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

simplify

Browse source
This commit is contained in:
Aleksey Kladov 2019-05-12 23:03:37 +03:00
parent 98531dc785
commit 9cba67b2ad
5 changed files with 12 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

17
crates/ra_hir/src/resolve.rs
View file

@ -1,16 +1,12 @@
//! Name resolution.
use std::sync::Arc;
use ra_syntax::ast;
use rustc_hash::{FxHashMap, FxHashSet};
use crate::{
ModuleDef, Trait,
code_model_api::Crate,
MacroCallId,
MacroCallLoc,
AstId,
MacroDefId,
db::HirDatabase,
name::{Name, KnownName},
nameres::{PerNs, CrateDefMap, CrateModuleId},
@ -134,16 +130,9 @@ impl Resolver {
resolution
}
pub(crate) fn resolve_macro_call(
&self,
db: &impl HirDatabase,
path: Option<Path>,
ast_id: AstId<ast::MacroCall>,
) -> Option<MacroCallId> {
pub(crate) fn resolve_macro_call(&self, path: Option<Path>) -> Option<MacroDefId> {
let name = path.and_then(|path| path.expand_macro_expr()).unwrap_or_else(Name::missing);
let def_id = self.module().and_then(|(module, _)| module.find_macro(&name))?;
let call_loc = MacroCallLoc { def: *def_id, ast_id }.id(db);
Some(call_loc)
self.module()?.0.find_macro(&name)
}
/// Returns the resolved path segments