language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 14:51:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

classify module from declaration

Browse source
This commit is contained in:
Ekaterina Babshukova 2019-10-15 22:50:28 +03:00
parent 93c179531b
commit 55e1910d00
4 changed files with 44 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/ra_ide_api/src/references/classify.rs
View file

@ -31,9 +31,16 @@ pub(crate) fn classify_name(
Some(from_struct_field(db, field))
},
ast::Module(it) => {
let ast = hir::ModuleSource::Module(it);
let src = hir::Source { file_id, ast };
let def = hir::Module::from_definition(db, src)?;
let def = {
if !it.has_semi() {
let ast = hir::ModuleSource::Module(it);
let src = hir::Source { file_id, ast };
hir::Module::from_definition(db, src)
} else {
let src = hir::Source { file_id, ast: it };
hir::Module::from_declaration(db, src)
}
}?;
Some(from_module_def(db, def.into(), None))
},
ast::StructDef(it) => {