From 6805bb01e203e7a1cbc145382a16c0069a5de6d5 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sun, 8 Dec 2019 12:57:13 +0100 Subject: Cleanup module structure --- crates/ra_hir/src/code_model.rs | 3 - crates/ra_hir/src/code_model/src.rs | 139 ------------------------------------ crates/ra_hir/src/has_source.rs | 139 ++++++++++++++++++++++++++++++++++++ crates/ra_hir/src/lib.rs | 12 ++-- 4 files changed, 146 insertions(+), 147 deletions(-) delete mode 100644 crates/ra_hir/src/code_model/src.rs create mode 100644 crates/ra_hir/src/has_source.rs (limited to 'crates') diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs index 7ac1bf461..fd30971b0 100644 --- a/crates/ra_hir/src/code_model.rs +++ b/crates/ra_hir/src/code_model.rs @@ -1,7 +1,4 @@ //! FIXME: write short doc here - -pub(crate) mod src; - use std::sync::Arc; use either::Either; diff --git a/crates/ra_hir/src/code_model/src.rs b/crates/ra_hir/src/code_model/src.rs deleted file mode 100644 index b09582f93..000000000 --- a/crates/ra_hir/src/code_model/src.rs +++ /dev/null @@ -1,139 +0,0 @@ -//! FIXME: write short doc here - -use either::Either; -use hir_def::{ - nameres::ModuleSource, - src::{HasChildSource, HasSource as _}, - AstItemDef, Lookup, VariantId, -}; -use ra_syntax::ast; - -use crate::{ - db::DefDatabase, Const, Enum, EnumVariant, FieldSource, Function, ImplBlock, Import, MacroDef, - Module, Static, Struct, StructField, Trait, TypeAlias, TypeParam, Union, -}; - -pub use hir_expand::InFile; - -pub trait HasSource { - type Ast; - fn source(self, db: &impl DefDatabase) -> InFile; -} - -/// NB: Module is !HasSource, because it has two source nodes at the same time: -/// definition and declaration. -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 DefDatabase) -> InFile { - let def_map = db.crate_def_map(self.id.krate); - def_map[self.id.local_id].definition_source(db) - } - - /// Returns a node which declares this module, either a `mod foo;` or a `mod foo {}`. - /// `None` for the crate root. - pub fn declaration_source(self, db: &impl DefDatabase) -> Option> { - let def_map = db.crate_def_map(self.id.krate); - def_map[self.id.local_id].declaration_source(db) - } -} - -impl HasSource for StructField { - type Ast = FieldSource; - fn source(self, db: &impl DefDatabase) -> InFile { - let var = VariantId::from(self.parent); - let src = var.child_source(db); - src.map(|it| match it[self.id].clone() { - Either::Left(it) => FieldSource::Pos(it), - Either::Right(it) => FieldSource::Named(it), - }) - } -} -impl HasSource for Struct { - type Ast = ast::StructDef; - fn source(self, db: &impl DefDatabase) -> InFile { - self.id.source(db) - } -} -impl HasSource for Union { - type Ast = ast::UnionDef; - fn source(self, db: &impl DefDatabase) -> InFile { - self.id.source(db) - } -} -impl HasSource for Enum { - type Ast = ast::EnumDef; - fn source(self, db: &impl DefDatabase) -> InFile { - self.id.source(db) - } -} -impl HasSource for EnumVariant { - type Ast = ast::EnumVariant; - fn source(self, db: &impl DefDatabase) -> InFile { - self.parent.id.child_source(db).map(|map| map[self.id].clone()) - } -} -impl HasSource for Function { - type Ast = ast::FnDef; - fn source(self, db: &impl DefDatabase) -> InFile { - self.id.lookup(db).source(db) - } -} -impl HasSource for Const { - type Ast = ast::ConstDef; - fn source(self, db: &impl DefDatabase) -> InFile { - self.id.lookup(db).source(db) - } -} -impl HasSource for Static { - type Ast = ast::StaticDef; - fn source(self, db: &impl DefDatabase) -> InFile { - self.id.lookup(db).source(db) - } -} -impl HasSource for Trait { - type Ast = ast::TraitDef; - fn source(self, db: &impl DefDatabase) -> InFile { - self.id.source(db) - } -} -impl HasSource for TypeAlias { - type Ast = ast::TypeAliasDef; - fn source(self, db: &impl DefDatabase) -> InFile { - self.id.lookup(db).source(db) - } -} -impl HasSource for MacroDef { - type Ast = ast::MacroCall; - fn source(self, db: &impl DefDatabase) -> InFile { - InFile { - file_id: self.id.ast_id.expect("MacroDef without ast_id").file_id, - value: self.id.ast_id.expect("MacroDef without ast_id").to_node(db), - } - } -} -impl HasSource for ImplBlock { - type Ast = ast::ImplBlock; - fn source(self, db: &impl DefDatabase) -> InFile { - self.id.source(db) - } -} -impl HasSource for Import { - type Ast = Either; - - /// Returns the syntax of the last path segment corresponding to this import - fn source(self, db: &impl DefDatabase) -> InFile { - let src = self.parent.definition_source(db); - let (_, source_map) = db.raw_items_with_source_map(src.file_id); - let root = db.parse_or_expand(src.file_id).unwrap(); - let ptr = source_map.get(self.id); - src.with_value(ptr.map_left(|it| it.to_node(&root)).map_right(|it| it.to_node(&root))) - } -} - -impl HasSource for TypeParam { - type Ast = Either; - fn source(self, db: &impl DefDatabase) -> InFile { - let child_source = self.id.parent.child_source(db); - child_source.map(|it| it[self.id.local_id].clone()) - } -} diff --git a/crates/ra_hir/src/has_source.rs b/crates/ra_hir/src/has_source.rs new file mode 100644 index 000000000..b09582f93 --- /dev/null +++ b/crates/ra_hir/src/has_source.rs @@ -0,0 +1,139 @@ +//! FIXME: write short doc here + +use either::Either; +use hir_def::{ + nameres::ModuleSource, + src::{HasChildSource, HasSource as _}, + AstItemDef, Lookup, VariantId, +}; +use ra_syntax::ast; + +use crate::{ + db::DefDatabase, Const, Enum, EnumVariant, FieldSource, Function, ImplBlock, Import, MacroDef, + Module, Static, Struct, StructField, Trait, TypeAlias, TypeParam, Union, +}; + +pub use hir_expand::InFile; + +pub trait HasSource { + type Ast; + fn source(self, db: &impl DefDatabase) -> InFile; +} + +/// NB: Module is !HasSource, because it has two source nodes at the same time: +/// definition and declaration. +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 DefDatabase) -> InFile { + let def_map = db.crate_def_map(self.id.krate); + def_map[self.id.local_id].definition_source(db) + } + + /// Returns a node which declares this module, either a `mod foo;` or a `mod foo {}`. + /// `None` for the crate root. + pub fn declaration_source(self, db: &impl DefDatabase) -> Option> { + let def_map = db.crate_def_map(self.id.krate); + def_map[self.id.local_id].declaration_source(db) + } +} + +impl HasSource for StructField { + type Ast = FieldSource; + fn source(self, db: &impl DefDatabase) -> InFile { + let var = VariantId::from(self.parent); + let src = var.child_source(db); + src.map(|it| match it[self.id].clone() { + Either::Left(it) => FieldSource::Pos(it), + Either::Right(it) => FieldSource::Named(it), + }) + } +} +impl HasSource for Struct { + type Ast = ast::StructDef; + fn source(self, db: &impl DefDatabase) -> InFile { + self.id.source(db) + } +} +impl HasSource for Union { + type Ast = ast::UnionDef; + fn source(self, db: &impl DefDatabase) -> InFile { + self.id.source(db) + } +} +impl HasSource for Enum { + type Ast = ast::EnumDef; + fn source(self, db: &impl DefDatabase) -> InFile { + self.id.source(db) + } +} +impl HasSource for EnumVariant { + type Ast = ast::EnumVariant; + fn source(self, db: &impl DefDatabase) -> InFile { + self.parent.id.child_source(db).map(|map| map[self.id].clone()) + } +} +impl HasSource for Function { + type Ast = ast::FnDef; + fn source(self, db: &impl DefDatabase) -> InFile { + self.id.lookup(db).source(db) + } +} +impl HasSource for Const { + type Ast = ast::ConstDef; + fn source(self, db: &impl DefDatabase) -> InFile { + self.id.lookup(db).source(db) + } +} +impl HasSource for Static { + type Ast = ast::StaticDef; + fn source(self, db: &impl DefDatabase) -> InFile { + self.id.lookup(db).source(db) + } +} +impl HasSource for Trait { + type Ast = ast::TraitDef; + fn source(self, db: &impl DefDatabase) -> InFile { + self.id.source(db) + } +} +impl HasSource for TypeAlias { + type Ast = ast::TypeAliasDef; + fn source(self, db: &impl DefDatabase) -> InFile { + self.id.lookup(db).source(db) + } +} +impl HasSource for MacroDef { + type Ast = ast::MacroCall; + fn source(self, db: &impl DefDatabase) -> InFile { + InFile { + file_id: self.id.ast_id.expect("MacroDef without ast_id").file_id, + value: self.id.ast_id.expect("MacroDef without ast_id").to_node(db), + } + } +} +impl HasSource for ImplBlock { + type Ast = ast::ImplBlock; + fn source(self, db: &impl DefDatabase) -> InFile { + self.id.source(db) + } +} +impl HasSource for Import { + type Ast = Either; + + /// Returns the syntax of the last path segment corresponding to this import + fn source(self, db: &impl DefDatabase) -> InFile { + let src = self.parent.definition_source(db); + let (_, source_map) = db.raw_items_with_source_map(src.file_id); + let root = db.parse_or_expand(src.file_id).unwrap(); + let ptr = source_map.get(self.id); + src.with_value(ptr.map_left(|it| it.to_node(&root)).map_right(|it| it.to_node(&root))) + } +} + +impl HasSource for TypeParam { + type Ast = Either; + fn source(self, db: &impl DefDatabase) -> InFile { + let child_source = self.id.parent.child_source(db); + child_source.map(|it| it[self.id.local_id].clone()) + } +} diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs index bb22882b1..946299ba0 100644 --- a/crates/ra_hir/src/lib.rs +++ b/crates/ra_hir/src/lib.rs @@ -36,16 +36,18 @@ pub mod diagnostics; mod from_id; mod code_model; -pub mod from_source; +mod has_source; +mod from_source; pub use crate::{ code_model::{ - src::HasSource, Adt, AssocItem, AttrDef, Const, Container, Crate, CrateDependency, - DefWithBody, Docs, Enum, EnumVariant, FieldSource, Function, GenericDef, HasAttrs, - ImplBlock, Import, Local, MacroDef, Module, ModuleDef, ScopeDef, Static, Struct, - StructField, Trait, Type, TypeAlias, TypeParam, Union, VariantDef, + Adt, AssocItem, AttrDef, Const, Container, Crate, CrateDependency, DefWithBody, Docs, Enum, + EnumVariant, FieldSource, Function, GenericDef, HasAttrs, ImplBlock, Import, Local, + MacroDef, Module, ModuleDef, ScopeDef, Static, Struct, StructField, Trait, Type, TypeAlias, + TypeParam, Union, VariantDef, }, from_source::FromSource, + has_source::HasSource, source_binder::{PathResolution, ScopeEntryWithSyntax, SourceAnalyzer}, }; -- cgit v1.2.3