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

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

15
crates/ra_hir/src/code_model_api.rs
View file

@ -1,7 +1,7 @@
use std::sync::Arc;
use relative_path::RelativePathBuf;
use ra_db::{CrateId, FileId, SourceRootId, Edition};
use ra_db::{CrateId, SourceRootId, Edition};
use ra_syntax::{ast::self, TreeArc, SyntaxNode};
use crate::{
@ -16,7 +16,7 @@ use crate::{
docs::{Documentation, Docs, docs_from_ast},
module_tree::ModuleId,
ids::{FunctionId, StructId, EnumId, AstItemDef, ConstId, StaticId, TraitId, TypeId},
impl_block::{ImplId, ImplBlock},
impl_block::ImplBlock,
resolve::Resolver,
};
@ -107,7 +107,7 @@ impl Module {
}
/// Returns a node which defines this module. That is, a file or a `mod foo {}` with items.
pub fn definition_source(&self, db: &impl PersistentHirDatabase) -> (FileId, ModuleSource) {
pub fn definition_source(&self, db: &impl PersistentHirDatabase) -> (HirFileId, ModuleSource) {
self.definition_source_impl(db)
}
@ -116,7 +116,7 @@ impl Module {
pub fn declaration_source(
&self,
db: &impl HirDatabase,
) -> Option<(FileId, TreeArc<ast::Module>)> {
) -> Option<(HirFileId, TreeArc<ast::Module>)> {
self.declaration_source_impl(db)
}
@ -129,11 +129,6 @@ impl Module {
self.import_source_impl(db, import)
}
/// Returns the syntax of the impl block in this module
pub fn impl_source(&self, db: &impl HirDatabase, impl_id: ImplId) -> TreeArc<ast::ImplBlock> {
self.impl_source_impl(db, impl_id)
}
/// Returns the crate this module is part of.
pub fn krate(&self, _db: &impl PersistentHirDatabase) -> Option<Crate> {
Some(self.krate)
@ -202,7 +197,7 @@ impl Module {
module_impl_blocks
.impls
.iter()
.map(|(impl_id, _)| ImplBlock::from_id(module_impl_blocks.clone(), impl_id))
.map(|(impl_id, _)| ImplBlock::from_id(self, impl_id))
.collect()
}
}