squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Simplify HasSource

Browse source
This commit is contained in:
Aleksey Kladov 2019-11-23 16:41:04 +03:00
parent e5bcb69e4f
commit 338ff052c2
1 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
crates/ra_hir/src/code_model/src.rs
View file

@ -5,24 +5,24 @@ use hir_expand::either::Either;
use ra_syntax::ast::{self, AstNode}; use ra_syntax::ast::{self, AstNode};
use crate::{ use crate::{
db::{AstDatabase, DefDatabase, HirDatabase}, db::{DefDatabase, HirDatabase},
ids::AstItemDef, ids::AstItemDef,
Const, Enum, EnumVariant, FieldSource, Function, HasBody, MacroDef, Module, ModuleSource, Const, Enum, EnumVariant, FieldSource, Function, HasBody, Import, MacroDef, Module,
Static, Struct, StructField, Trait, TypeAlias, Union, Import ModuleSource, Static, Struct, StructField, Trait, TypeAlias, Union,
}; };
pub use hir_expand::Source; pub use hir_expand::Source;
pub trait HasSource { pub trait HasSource {
type Ast; type Ast;
fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<Self::Ast>; fn source(self, db: &impl DefDatabase) -> Source<Self::Ast>;
} }
/// NB: Module is !HasSource, because it has two source nodes at the same time: /// NB: Module is !HasSource, because it has two source nodes at the same time:
/// definition and declaration. /// definition and declaration.
impl Module { impl Module {
/// Returns a node which defines this module. That is, a file or a `mod foo {}` with items. /// Returns a node which defines this module. That is, a file or a `mod foo {}` with items.
pub fn definition_source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<ModuleSource> { pub fn definition_source(self, db: &impl DefDatabase) -> Source<ModuleSource> {
let def_map = db.crate_def_map(self.id.krate); let def_map = db.crate_def_map(self.id.krate);
let src = def_map[self.id.module_id].definition_source(db); let src = def_map[self.id.module_id].definition_source(db);
src.map(|it| match it { src.map(|it| match it {
@ -33,10 +33,7 @@ impl Module {
/// Returns a node which declares this module, either a `mod foo;` or a `mod foo {}`. /// Returns a node which declares this module, either a `mod foo;` or a `mod foo {}`.
/// `None` for the crate root. /// `None` for the crate root.
pub fn declaration_source( pub fn declaration_source(self, db: &impl DefDatabase) -> Option<Source<ast::Module>> {
self,
db: &(impl DefDatabase + AstDatabase),
) -> Option<Source<ast::Module>> {
let def_map = db.crate_def_map(self.id.krate); let def_map = db.crate_def_map(self.id.krate);
def_map[self.id.module_id].declaration_source(db) def_map[self.id.module_id].declaration_source(db)
} }
@ -44,7 +41,7 @@ impl Module {
impl HasSource for StructField { impl HasSource for StructField {
type Ast = FieldSource; type Ast = FieldSource;
fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<FieldSource> { fn source(self, db: &impl DefDatabase) -> Source<FieldSource> {
let var = VariantId::from(self.parent); let var = VariantId::from(self.parent);
let src = var.child_source(db); let src = var.child_source(db);
src.map(|it| match it[self.id].clone() { src.map(|it| match it[self.id].clone() {
@ -55,61 +52,61 @@ impl HasSource for StructField {
} }
impl HasSource for Struct { impl HasSource for Struct {
type Ast = ast::StructDef; type Ast = ast::StructDef;
fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<ast::StructDef> { fn source(self, db: &impl DefDatabase) -> Source<ast::StructDef> {
self.id.0.source(db) self.id.0.source(db)
} }
} }
impl HasSource for Union { impl HasSource for Union {
type Ast = ast::StructDef; type Ast = ast::StructDef;
fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<ast::StructDef> { fn source(self, db: &impl DefDatabase) -> Source<ast::StructDef> {
self.id.0.source(db) self.id.0.source(db)
} }
} }
impl HasSource for Enum { impl HasSource for Enum {
type Ast = ast::EnumDef; type Ast = ast::EnumDef;
fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<ast::EnumDef> { fn source(self, db: &impl DefDatabase) -> Source<ast::EnumDef> {
self.id.source(db) self.id.source(db)
} }
} }
impl HasSource for EnumVariant { impl HasSource for EnumVariant {
type Ast = ast::EnumVariant; type Ast = ast::EnumVariant;
fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<ast::EnumVariant> { fn source(self, db: &impl DefDatabase) -> Source<ast::EnumVariant> {
self.parent.id.child_source(db).map(|map| map[self.id].clone()) self.parent.id.child_source(db).map(|map| map[self.id].clone())
} }
} }
impl HasSource for Function { impl HasSource for Function {
type Ast = ast::FnDef; type Ast = ast::FnDef;
fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<ast::FnDef> { fn source(self, db: &impl DefDatabase) -> Source<ast::FnDef> {
self.id.lookup(db).source(db) self.id.lookup(db).source(db)
} }
} }
impl HasSource for Const { impl HasSource for Const {
type Ast = ast::ConstDef; type Ast = ast::ConstDef;
fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<ast::ConstDef> { fn source(self, db: &impl DefDatabase) -> Source<ast::ConstDef> {
self.id.lookup(db).source(db) self.id.lookup(db).source(db)
} }
} }
impl HasSource for Static { impl HasSource for Static {
type Ast = ast::StaticDef; type Ast = ast::StaticDef;
fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<ast::StaticDef> { fn source(self, db: &impl DefDatabase) -> Source<ast::StaticDef> {
self.id.source(db) self.id.source(db)
} }
} }
impl HasSource for Trait { impl HasSource for Trait {
type Ast = ast::TraitDef; type Ast = ast::TraitDef;
fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<ast::TraitDef> { fn source(self, db: &impl DefDatabase) -> Source<ast::TraitDef> {
self.id.source(db) self.id.source(db)
} }
} }
impl HasSource for TypeAlias { impl HasSource for TypeAlias {
type Ast = ast::TypeAliasDef; type Ast = ast::TypeAliasDef;
fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<ast::TypeAliasDef> { fn source(self, db: &impl DefDatabase) -> Source<ast::TypeAliasDef> {
self.id.lookup(db).source(db) self.id.lookup(db).source(db)
} }
} }
impl HasSource for MacroDef { impl HasSource for MacroDef {
type Ast = ast::MacroCall; type Ast = ast::MacroCall;
fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<ast::MacroCall> { fn source(self, db: &impl DefDatabase) -> Source<ast::MacroCall> {
Source { file_id: self.id.ast_id.file_id(), value: self.id.ast_id.to_node(db) } Source { file_id: self.id.ast_id.file_id(), value: self.id.ast_id.to_node(db) }
} }
} }
@ -117,7 +114,7 @@ impl HasSource for Import {
type Ast = Either<ast::UseTree, ast::ExternCrateItem>; type Ast = Either<ast::UseTree, ast::ExternCrateItem>;
/// Returns the syntax of the last path segment corresponding to this import /// Returns the syntax of the last path segment corresponding to this import
fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<Self::Ast> { fn source(self, db: &impl DefDatabase) -> Source<Self::Ast> {
let src = self.parent.definition_source(db); let src = self.parent.definition_source(db);
let (_, source_map) = db.raw_items_with_source_map(src.file_id); let (_, source_map) = db.raw_items_with_source_map(src.file_id);
src.with_value(source_map.get(&src.value, self.id)) src.with_value(source_map.get(&src.value, self.id))