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

use names everywhere

Browse source
This commit is contained in:
Aleksey Kladov 2018-12-27 21:21:10 +03:00
parent 63f54d234f
commit e066050671
3 changed files with 51 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

34
crates/ra_analysis/src/imp.rs
View file

@ -243,7 +243,7 @@ impl AnalysisImpl {
rr.add_resolution(
position.file_id,
FileSymbol {
name: entry.name().clone(),
name: entry.name().to_string().into(),
node_range: entry.ptr().range(),
kind: NAME,
},
@ -261,23 +261,21 @@ impl AnalysisImpl {
let mut rr = ReferenceResolution::new(name.syntax().range());
if let Some(module) = name.syntax().parent().and_then(ast::Module::cast) {
if module.has_semi() {
let parent_module =
source_binder::module_from_file_id(&*self.db, position.file_id)?;
let child_name = module.name();
match (parent_module, child_name) {
(Some(parent_module), Some(child_name)) => {
if let Some(child) = parent_module.child(&child_name.text()) {
let file_id = child.source().file_id();
let symbol = FileSymbol {
name: child_name.text(),
node_range: TextRange::offset_len(0.into(), 0.into()),
kind: MODULE,
};
rr.add_resolution(file_id, symbol);
return Ok(Some(rr));
}
}
_ => (),
if let Some(child_module) =
source_binder::module_from_declaration(&*self.db, position.file_id, module)?
{
let file_id = child_module.source().file_id();
let name = match child_module.name() {
Some(name) => name.to_string().into(),
None => "".into(),
};
let symbol = FileSymbol {
name,
node_range: TextRange::offset_len(0.into(), 0.into()),
kind: MODULE,
};
rr.add_resolution(file_id, symbol);
return Ok(Some(rr));
}
}
}