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

Added macro resolution and expansion

Browse source
This commit is contained in:
Lenard Pratt 2019-04-15 11:01:29 +01:00
parent afaeb18910
commit ce211434a6
8 changed files with 134 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,6 +6,7 @@ use rustc_hash::FxHashMap;
use crate::{
ModuleDef,
code_model_api::Crate,
MacroDefId,
db::HirDatabase,
name::{Name, KnownName},
nameres::{PerNs, CrateDefMap, CrateModuleId},
@ -130,6 +131,10 @@ impl Resolver {
resolution
}
pub fn resolve_macro_call(&self, name: &Name) -> Option<&MacroDefId> {
self.module().and_then(|(module, _)| module.find_macro(name))
}
/// Returns the resolved path segments
/// Which may be fully resolved, empty or partially resolved.
pub(crate) fn resolve_path_segments(&self, db: &impl HirDatabase, path: &Path) -> PathResult {
@ -192,7 +197,7 @@ impl Resolver {
.flatten()
}
fn module(&self) -> Option<(&CrateDefMap, CrateModuleId)> {
pub(crate) fn module(&self) -> Option<(&CrateDefMap, CrateModuleId)> {
self.scopes.iter().rev().find_map(|scope| match scope {
Scope::ModuleScope(m) => Some((&*m.crate_def_map, m.module_id)),