Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 05:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

move query impls to adt

Browse source
This commit is contained in:
Aleksey Kladov 2019-01-08 15:38:29 +03:00
parent 64f202bdd7
commit 5edcf313f6
3 changed files with 31 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
crates/ra_hir/src/adt.rs
View file

@ -1,9 +1,10 @@
use std::sync::Arc;
use ra_syntax::ast::{self, NameOwner, StructFlavor};
use ra_db::Cancelable;
use ra_syntax::ast::{self, NameOwner, StructFlavor, AstNode};
use crate::{
DefId, Name, AsName, Struct, Enum, VariantData, StructField,
DefId, Name, AsName, Struct, Enum, VariantData, StructField, HirDatabase, DefKind,
type_ref::TypeRef,
};
@ -20,12 +21,24 @@ pub struct StructData {
}
impl StructData {
pub(crate) fn new(struct_def: &ast::StructDef) -> StructData {
fn new(struct_def: &ast::StructDef) -> StructData {
let name = struct_def.name().map(|n| n.as_name());
let variant_data = VariantData::new(struct_def.flavor());
let variant_data = Arc::new(variant_data);
StructData { name, variant_data }
}
pub(crate) fn struct_data_query(
db: &impl HirDatabase,
def_id: DefId,
) -> Cancelable<Arc<StructData>> {
let def_loc = def_id.loc(db);
assert!(def_loc.kind == DefKind::Struct);
let syntax = db.file_item(def_loc.source_item_id);
let struct_def =
ast::StructDef::cast(&syntax).expect("struct def should point to StructDef node");
Ok(Arc::new(StructData::new(struct_def)))
}
}
impl Enum {
@ -41,7 +54,7 @@ pub struct EnumData {
}
impl EnumData {
pub(crate) fn new(enum_def: &ast::EnumDef) -> Self {
fn new(enum_def: &ast::EnumDef) -> Self {
let name = enum_def.name().map(|n| n.as_name());
let variants = if let Some(evl) = enum_def.variant_list() {
evl.variants()
@ -57,6 +70,17 @@ impl EnumData {
};
EnumData { name, variants }
}
pub(crate) fn enum_data_query(
db: &impl HirDatabase,
def_id: DefId,
) -> Cancelable<Arc<EnumData>> {
let def_loc = def_id.loc(db);
assert!(def_loc.kind == DefKind::Enum);
let syntax = db.file_item(def_loc.source_item_id);
let enum_def = ast::EnumDef::cast(&syntax).expect("enum def should point to EnumDef node");
Ok(Arc::new(EnumData::new(enum_def)))
}
}
impl VariantData {

4
crates/ra_hir/src/db.rs
View file

@ -38,12 +38,12 @@ pub trait HirDatabase: SyntaxDatabase
fn struct_data(def_id: DefId) -> Cancelable<Arc<StructData>> {
type StructDataQuery;
use fn query_definitions::struct_data;
use fn crate::adt::StructData::struct_data_query;
}
fn enum_data(def_id: DefId) -> Cancelable<Arc<EnumData>> {
type EnumDataQuery;
use fn query_definitions::enum_data;
use fn crate::adt::EnumData::enum_data_query;
}
fn infer(def_id: DefId) -> Cancelable<Arc<InferenceResult>> {

20
crates/ra_hir/src/query_definitions.rs
View file

@ -11,13 +11,12 @@ use ra_syntax::{
use ra_db::{SourceRootId, Cancelable,};
use crate::{
SourceFileItems, SourceItemId, DefKind, DefId, HirFileId, ModuleSource,
SourceFileItems, SourceItemId, DefId, HirFileId, ModuleSource,
MacroCallLoc,
db::HirDatabase,
function::FnScopes,
module_tree::ModuleId,
nameres::{InputModuleItems, ItemMap, Resolver},
adt::{StructData, EnumData},
};
pub(super) fn fn_scopes(db: &impl HirDatabase, def_id: DefId) -> Cancelable<Arc<FnScopes>> {
@ -26,23 +25,6 @@ pub(super) fn fn_scopes(db: &impl HirDatabase, def_id: DefId) -> Cancelable<Arc<
Ok(Arc::new(res))
}
pub(super) fn struct_data(db: &impl HirDatabase, def_id: DefId) -> Cancelable<Arc<StructData>> {
let def_loc = def_id.loc(db);
assert!(def_loc.kind == DefKind::Struct);
let syntax = db.file_item(def_loc.source_item_id);
let struct_def =
ast::StructDef::cast(&syntax).expect("struct def should point to StructDef node");
Ok(Arc::new(StructData::new(struct_def)))
}
pub(super) fn enum_data(db: &impl HirDatabase, def_id: DefId) -> Cancelable<Arc<EnumData>> {
let def_loc = def_id.loc(db);
assert!(def_loc.kind == DefKind::Enum);
let syntax = db.file_item(def_loc.source_item_id);
let enum_def = ast::EnumDef::cast(&syntax).expect("enum def should point to EnumDef node");
Ok(Arc::new(EnumData::new(enum_def)))
}
pub(super) fn file_items(db: &impl HirDatabase, file_id: HirFileId) -> Arc<SourceFileItems> {
let source_file = db.hir_source_file(file_id);
let res = SourceFileItems::new(file_id, &source_file);