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

Make macro scope a real name scope

Browse source 
Fix some details about module scoping
This commit is contained in:
uHOOCCOOHu 2019-09-09 20:54:02 +08:00
parent 734a43e95a
commit 40f9134159
No known key found for this signature in database
GPG key ID: CED392DE0C483D00
8 changed files with 399 additions and 236 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,6 @@ use rustc_hash::{FxHashMap, FxHashSet};
use crate::{
code_model::Crate,
db::HirDatabase,
either::Either,
expr::{
scope::{ExprScopes, ScopeId},
PatId,
@ -126,7 +125,7 @@ impl Resolver {
let mut resolution = PerNs::none();
for scope in self.scopes.iter().rev() {
resolution = resolution.or(scope.resolve_name(db, name));
if resolution.is_both() {
if resolution.is_all() {
return resolution;
}
}
@ -139,10 +138,7 @@ impl Resolver {
path: &Path,
) -> Option<MacroDef> {
let (item_map, module) = self.module()?;
match item_map.resolve_path_with_macro(db, module, path) {
(Either::B(macro_def), None) => Some(macro_def),
_ => None,
}
item_map.resolve_path(db, module, path).0.get_macros()
}
/// Returns the resolved path segments
@ -191,6 +187,9 @@ impl Resolver {
if current.values.is_none() {
current.values = res.values;
}
if current.macros.is_none() {
current.macros = res.macros;
}
});
}
names
@ -313,6 +312,9 @@ impl Scope {
m.crate_def_map[m.module_id].scope.entries().for_each(|(name, res)| {
f(name.clone(), res.def.map(Resolution::Def));
});
m.crate_def_map[m.module_id].scope.legacy_macros().for_each(|(name, macro_)| {
f(name.clone(), PerNs::macros(macro_));
});
m.crate_def_map.extern_prelude().iter().for_each(|(name, def)| {
f(name.clone(), PerNs::types(Resolution::Def(*def)));
});