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

Turn ImplBlock into a copy type just containing IDs

Browse source 
This makes it more like the other code model types.

Also make Module::definition_source/declaration_source return HirFileIds, to
make them more like the other source functions.
This commit is contained in:
Florian Diebold 2019-02-16 21:09:58 +01:00
parent 6932b77093
commit 0242acae53
9 changed files with 65 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/ra_ide_api/src/impls.rs
View file

@ -50,8 +50,8 @@ fn impls_for_def(
Some(
impls
.lookup_impl_blocks(db, &ty)
.map(|(module, imp)| NavigationTarget::from_impl_block(db, module, &imp))
.lookup_impl_blocks(&ty)
.map(|imp| NavigationTarget::from_impl_block(db, imp))
.collect(),
)
}
@ -68,8 +68,8 @@ fn impls_for_trait(
Some(
impls
.lookup_impl_blocks_for_trait(db, &tr)
.map(|(module, imp)| NavigationTarget::from_impl_block(db, module, &imp))
.lookup_impl_blocks_for_trait(&tr)
.map(|imp| NavigationTarget::from_impl_block(db, imp))
.collect(),
)
}

15
crates/ra_ide_api/src/navigation_target.rs
View file

@ -79,6 +79,7 @@ impl NavigationTarget {
pub(crate) fn from_module(db: &RootDatabase, module: hir::Module) -> NavigationTarget {
let (file_id, source) = module.definition_source(db);
let file_id = file_id.as_original_file();
let name = module.name(db).map(|it| it.to_string().into()).unwrap_or_default();
match source {
ModuleSource::SourceFile(node) => {
@ -93,6 +94,7 @@ impl NavigationTarget {
pub(crate) fn from_module_to_decl(db: &RootDatabase, module: hir::Module) -> NavigationTarget {
let name = module.name(db).map(|it| it.to_string().into()).unwrap_or_default();
if let Some((file_id, source)) = module.declaration_source(db) {
let file_id = file_id.as_original_file();
return NavigationTarget::from_syntax(file_id, name, None, source.syntax());
}
NavigationTarget::from_module(db, module)
@ -151,12 +153,15 @@ impl NavigationTarget {
pub(crate) fn from_impl_block(
db: &RootDatabase,
module: hir::Module,
impl_block: &hir::ImplBlock,
impl_block: hir::ImplBlock,
) -> NavigationTarget {
let (file_id, _) = module.definition_source(db);
let node = module.impl_source(db, impl_block.id());
NavigationTarget::from_syntax(file_id, "impl".into(), None, node.syntax())
let (file_id, node) = impl_block.source(db);
NavigationTarget::from_syntax(
file_id.as_original_file(),
"impl".into(),
None,
node.syntax(),
)
}
#[cfg(test)]

1
crates/ra_ide_api/src/references.rs
View file

@ -100,6 +100,7 @@ fn rename_mod(
if let Some(module) = source_binder::module_from_declaration(db, position.file_id, &ast_module)
{
let (file_id, module_source) = module.definition_source(db);
let file_id = file_id.as_original_file();
match module_source {
ModuleSource::SourceFile(..) => {
let mod_path: RelativePathBuf = db.file_relative_path(file_id);