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

Simplify from_source

Browse source
This commit is contained in:
Aleksey Kladov 2019-12-12 14:48:33 +01:00
parent 82e9b24558
commit 63c192b34a
1 changed files with 34 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

53
crates/ra_hir/src/from_source.rs
View file

@ -44,16 +44,16 @@ impl FromSource for Enum {
impl FromSource for Trait { impl FromSource for Trait {
type Ast = ast::TraitDef; type Ast = ast::TraitDef;
fn from_source(db: &(impl DefDatabase + AstDatabase), src: InFile<Self::Ast>) -> Option<Self> { fn from_source(db: &(impl DefDatabase + AstDatabase), src: InFile<Self::Ast>) -> Option<Self> {
// XXX: use `.parent()` to avoid finding ourselves analyze_container(db, src.as_ref().map(|it| it.syntax()))[keys::TRAIT]
let parent = src.value.syntax().parent()?; .get(&src)
let container = Container::find(db, src.with_value(parent).as_ref())?; .copied()
container.child_by_source(db)[keys::TRAIT].get(&src).copied().map(Trait::from) .map(Trait::from)
} }
} }
impl FromSource for Function { impl FromSource for Function {
type Ast = ast::FnDef; type Ast = ast::FnDef;
fn from_source(db: &(impl DefDatabase + AstDatabase), src: InFile<Self::Ast>) -> Option<Self> { fn from_source(db: &(impl DefDatabase + AstDatabase), src: InFile<Self::Ast>) -> Option<Self> {
Container::find(db, src.as_ref().map(|it| it.syntax()))?.child_by_source(db)[keys::FUNCTION] analyze_container(db, src.as_ref().map(|it| it.syntax()))[keys::FUNCTION]
.get(&src) .get(&src)
.copied() .copied()
.map(Function::from) .map(Function::from)
@ -63,7 +63,7 @@ impl FromSource for Function {
impl FromSource for Const { impl FromSource for Const {
type Ast = ast::ConstDef; type Ast = ast::ConstDef;
fn from_source(db: &(impl DefDatabase + AstDatabase), src: InFile<Self::Ast>) -> Option<Self> { fn from_source(db: &(impl DefDatabase + AstDatabase), src: InFile<Self::Ast>) -> Option<Self> {
Container::find(db, src.as_ref().map(|it| it.syntax()))?.child_by_source(db)[keys::CONST] analyze_container(db, src.as_ref().map(|it| it.syntax()))[keys::CONST]
.get(&src) .get(&src)
.copied() .copied()
.map(Const::from) .map(Const::from)
@ -72,7 +72,7 @@ impl FromSource for Const {
impl FromSource for Static { impl FromSource for Static {
type Ast = ast::StaticDef; type Ast = ast::StaticDef;
fn from_source(db: &(impl DefDatabase + AstDatabase), src: InFile<Self::Ast>) -> Option<Self> { fn from_source(db: &(impl DefDatabase + AstDatabase), src: InFile<Self::Ast>) -> Option<Self> {
Container::find(db, src.as_ref().map(|it| it.syntax()))?.child_by_source(db)[keys::STATIC] analyze_container(db, src.as_ref().map(|it| it.syntax()))[keys::STATIC]
.get(&src) .get(&src)
.copied() .copied()
.map(Static::from) .map(Static::from)
@ -82,8 +82,7 @@ impl FromSource for Static {
impl FromSource for TypeAlias { impl FromSource for TypeAlias {
type Ast = ast::TypeAliasDef; type Ast = ast::TypeAliasDef;
fn from_source(db: &(impl DefDatabase + AstDatabase), src: InFile<Self::Ast>) -> Option<Self> { fn from_source(db: &(impl DefDatabase + AstDatabase), src: InFile<Self::Ast>) -> Option<Self> {
Container::find(db, src.as_ref().map(|it| it.syntax()))?.child_by_source(db) analyze_container(db, src.as_ref().map(|it| it.syntax()))[keys::TYPE_ALIAS]
[keys::TYPE_ALIAS]
.get(&src) .get(&src)
.copied() .copied()
.map(TypeAlias::from) .map(TypeAlias::from)
@ -109,10 +108,10 @@ impl FromSource for MacroDef {
impl FromSource for ImplBlock { impl FromSource for ImplBlock {
type Ast = ast::ImplBlock; type Ast = ast::ImplBlock;
fn from_source(db: &(impl DefDatabase + AstDatabase), src: InFile<Self::Ast>) -> Option<Self> { fn from_source(db: &(impl DefDatabase + AstDatabase), src: InFile<Self::Ast>) -> Option<Self> {
// XXX: use `.parent()` to avoid finding ourselves analyze_container(db, src.as_ref().map(|it| it.syntax()))[keys::IMPL]
let parent = src.value.syntax().parent()?; .get(&src)
let container = Container::find(db, src.with_value(parent).as_ref())?; .copied()
container.child_by_source(db)[keys::IMPL].get(&src).copied().map(ImplBlock::from) .map(ImplBlock::from)
} }
} }
@ -262,25 +261,22 @@ where
Some(DEF::from_ast_id(ctx, item_id)) Some(DEF::from_ast_id(ctx, item_id))
} }
enum Container { fn analyze_container(db: &impl DefDatabase, src: InFile<&SyntaxNode>) -> DynMap {
Trait(Trait), _analyze_container(db, src).unwrap_or_default()
ImplBlock(ImplBlock),
Module(Module),
} }
impl Container { fn _analyze_container(db: &impl DefDatabase, src: InFile<&SyntaxNode>) -> Option<DynMap> {
fn find(db: &impl DefDatabase, src: InFile<&SyntaxNode>) -> Option<Container> {
// FIXME: this doesn't try to handle nested declarations // FIXME: this doesn't try to handle nested declarations
for container in src.value.ancestors() { for container in src.value.ancestors().skip(1) {
let res = match_ast! { let res = match_ast! {
match container { match container {
ast::TraitDef(it) => { ast::TraitDef(it) => {
let c = Trait::from_source(db, src.with_value(it))?; let c = Trait::from_source(db, src.with_value(it))?;
Container::Trait(c) c.id.child_by_source(db)
}, },
ast::ImplBlock(it) => { ast::ImplBlock(it) => {
let c = ImplBlock::from_source(db, src.with_value(it))?; let c = ImplBlock::from_source(db, src.with_value(it))?;
Container::ImplBlock(c) c.id.child_by_source(db)
}, },
_ => { continue }, _ => { continue },
} }
@ -290,16 +286,5 @@ impl Container {
let module_source = ModuleSource::from_child_node(db, src); let module_source = ModuleSource::from_child_node(db, src);
let c = Module::from_definition(db, src.with_value(module_source))?; let c = Module::from_definition(db, src.with_value(module_source))?;
Some(Container::Module(c)) Some(c.id.child_by_source(db))
}
}
impl ChildBySource for Container {
fn child_by_source(&self, db: &impl DefDatabase) -> DynMap {
match self {
Container::Trait(it) => it.id.child_by_source(db),
Container::ImplBlock(it) => it.id.child_by_source(db),
Container::Module(it) => it.id.child_by_source(db),
}
}
} }