language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 12:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Use aliases in import resolution

Browse source
This commit is contained in:
Florian Diebold 2019-02-02 00:23:59 +01:00
parent 5a7fce4e4c
commit d8ef8acb47
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
crates/ra_hir/src/nameres.rs
View file

@ -251,10 +251,14 @@ where
}; };
} }
for (import_id, import_data) in input.imports.iter() { for (import_id, import_data) in input.imports.iter() {
if let Some(segment) = import_data.path.segments.iter().last() { if let Some(last_segment) = import_data.path.segments.iter().last() {
if !import_data.is_glob { if !import_data.is_glob {
let name = import_data
.alias
.clone()
.unwrap_or_else(|| last_segment.name.clone());
module_items.items.insert( module_items.items.insert(
segment.name.clone(), name,
Resolution { Resolution {
def: PerNs::none(), def: PerNs::none(),
import: Some(import_id), import: Some(import_id),
@ -319,19 +323,18 @@ where
if reached_fixedpoint == ReachedFixedPoint::Yes { if reached_fixedpoint == ReachedFixedPoint::Yes {
let last_segment = import.path.segments.last().unwrap(); let last_segment = import.path.segments.last().unwrap();
let name = import
.alias
.clone()
.unwrap_or_else(|| last_segment.name.clone());
log::debug!("resolved import {:?} ({:?}) to {:?}", name, import, def,);
self.update(module_id, |items| { self.update(module_id, |items| {
let res = Resolution { let res = Resolution {
def, def,
import: Some(import_id), import: Some(import_id),
}; };
items.items.insert(last_segment.name.clone(), res); items.items.insert(name, res);
}); });
log::debug!(
"resolved import {:?} ({:?}) cross-source root to {:?}",
last_segment.name,
import,
def,
);
} }
reached_fixedpoint reached_fixedpoint
} }