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

More natural trait setup

Browse source
This commit is contained in:
Aleksey Kladov 2020-01-16 16:27:21 +01:00
parent 8691ae8ac0
commit a3d6ddbe69
4 changed files with 49 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,8 +14,7 @@ use ra_syntax::{
use crate::{
db::{DefDatabase, HirDatabase},
Const, DefWithBody, Enum, Function, ImplBlock, InFile, Local, Module, SourceBinder, Static,
Struct, Trait, TypeAlias, TypeParam,
DefWithBody, InFile, Local, Module, SourceBinder, TypeParam,
};
impl Local {
@ -25,9 +24,9 @@ impl Local {
let parent: DefWithBody = src.value.syntax().ancestors().find_map(|it| {
let res = match_ast! {
match it {
ast::ConstDef(value) => { sb.to_def::<Const, _>(InFile { value, file_id})?.into() },
ast::StaticDef(value) => { sb.to_def::<Static, _>(InFile { value, file_id})?.into() },
ast::FnDef(value) => { sb.to_def::<Function, _>(InFile { value, file_id})?.into() },
ast::ConstDef(value) => { sb.to_def(InFile { value, file_id})?.into() },
ast::StaticDef(value) => { sb.to_def(InFile { value, file_id})?.into() },
ast::FnDef(value) => { sb.to_def(InFile { value, file_id})?.into() },
_ => return None,
}
};
@ -47,12 +46,12 @@ impl TypeParam {
let parent: GenericDefId = src.value.syntax().ancestors().find_map(|it| {
let res = match_ast! {
match it {
ast::FnDef(value) => { sb.to_def::<Function, _>(InFile { value, file_id})?.id.into() },
ast::StructDef(value) => { sb.to_def::<Struct, _>(InFile { value, file_id})?.id.into() },
ast::EnumDef(value) => { sb.to_def::<Enum, _>(InFile { value, file_id})?.id.into() },
ast::TraitDef(value) => { sb.to_def::<Trait, _>(InFile { value, file_id})?.id.into() },
ast::TypeAliasDef(value) => { sb.to_def::<TypeAlias, _>(InFile { value, file_id})?.id.into() },
ast::ImplBlock(value) => { sb.to_def::<ImplBlock, _>(InFile { value, file_id})?.id.into() },
ast::FnDef(value) => { sb.to_def(InFile { value, file_id})?.id.into() },
ast::StructDef(value) => { sb.to_def(InFile { value, file_id})?.id.into() },
ast::EnumDef(value) => { sb.to_def(InFile { value, file_id})?.id.into() },
ast::TraitDef(value) => { sb.to_def(InFile { value, file_id})?.id.into() },
ast::TypeAliasDef(value) => { sb.to_def(InFile { value, file_id})?.id.into() },
ast::ImplBlock(value) => { sb.to_def(InFile { value, file_id})?.id.into() },
_ => return None,
}
};