source_binder => match_ast!

This commit is contained in:
kjeremy 2019-10-30 16:08:27 -04:00
parent 998088876d
commit b205a0ced3

View File

@ -12,7 +12,7 @@
use ra_db::FileId; use ra_db::FileId;
use ra_syntax::{ use ra_syntax::{
ast::{self, AstNode}, ast::{self, AstNode},
AstPtr, match_ast, AstPtr,
SyntaxKind::*, SyntaxKind::*,
SyntaxNode, SyntaxNodePtr, TextRange, TextUnit, SyntaxNode, SyntaxNodePtr, TextRange, TextUnit,
}; };
@ -37,24 +37,34 @@ fn try_get_resolver_for_node(
file_id: FileId, file_id: FileId,
node: &SyntaxNode, node: &SyntaxNode,
) -> Option<Resolver> { ) -> Option<Resolver> {
if let Some(module) = ast::Module::cast(node.clone()) { match_ast! {
let src = crate::Source { file_id: file_id.into(), ast: module }; match node {
Some(crate::Module::from_declaration(db, src)?.resolver(db)) ast::Module(it) => {
} else if let Some(file) = ast::SourceFile::cast(node.clone()) { let src = crate::Source { file_id: file_id.into(), ast: it };
let src = Some(crate::Module::from_declaration(db, src)?.resolver(db))
crate::Source { file_id: file_id.into(), ast: crate::ModuleSource::SourceFile(file) }; },
Some(crate::Module::from_definition(db, src)?.resolver(db)) ast::SourceFile(it) => {
} else if let Some(s) = ast::StructDef::cast(node.clone()) { let src =
let src = crate::Source { file_id: file_id.into(), ast: s }; crate::Source { file_id: file_id.into(), ast: crate::ModuleSource::SourceFile(it) };
Some(Struct::from_source(db, src)?.resolver(db)) Some(crate::Module::from_definition(db, src)?.resolver(db))
} else if let Some(e) = ast::EnumDef::cast(node.clone()) { },
let src = crate::Source { file_id: file_id.into(), ast: e }; ast::StructDef(it) => {
Some(Enum::from_source(db, src)?.resolver(db)) let src = crate::Source { file_id: file_id.into(), ast: it };
} else if node.kind() == FN_DEF || node.kind() == CONST_DEF || node.kind() == STATIC_DEF { Some(Struct::from_source(db, src)?.resolver(db))
Some(def_with_body_from_child_node(db, file_id, node)?.resolver(db)) },
} else { ast::EnumDef(it) => {
// FIXME add missing cases let src = crate::Source { file_id: file_id.into(), ast: it };
None Some(Enum::from_source(db, src)?.resolver(db))
},
_ => {
if node.kind() == FN_DEF || node.kind() == CONST_DEF || node.kind() == STATIC_DEF {
Some(def_with_body_from_child_node(db, file_id, node)?.resolver(db))
} else {
// FIXME add missing cases
None
}
},
}
} }
} }
@ -68,16 +78,14 @@ fn def_with_body_from_child_node(
let ctx = LocationCtx::new(db, module.id, file_id.into()); let ctx = LocationCtx::new(db, module.id, file_id.into());
node.ancestors().find_map(|node| { node.ancestors().find_map(|node| {
if let Some(def) = ast::FnDef::cast(node.clone()) { match_ast! {
return Some(Function { id: ctx.to_def(&def) }.into()); match node {
ast::FnDef(def) => { Some(Function {id: ctx.to_def(&def) }.into()) },
ast::ConstDef(def) => { Some(Const { id: ctx.to_def(&def) }.into()) },
ast::StaticDef(def) => { Some(Static { id: ctx.to_def(&def) }.into()) },
_ => { None },
}
} }
if let Some(def) = ast::ConstDef::cast(node.clone()) {
return Some(Const { id: ctx.to_def(&def) }.into());
}
if let Some(def) = ast::StaticDef::cast(node) {
return Some(Static { id: ctx.to_def(&def) }.into());
}
None
}) })
} }