itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 11:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

adapt ide_api to the new API

Browse Source
This commit is contained in:
Aleksey Kladov 2019-01-24 23:36:16 +03:00
parent 4c514a3e02
commit 6a5a1f5902
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crates/ra_hir/src/code_model_api.rs
View File

@ -47,7 +47,6 @@ impl Crate {
#[derive(Debug)] #[derive(Debug)]
pub enum Def { pub enum Def {
EnumVariant(EnumVariant),
Const(Const), Const(Const),
Static(Static), Static(Static),
Trait(Trait), Trait(Trait),

5
crates/ra_ide_api/src/completion/complete_path.rs
View File

@ -40,7 +40,10 @@ pub(super) fn complete_path(acc: &mut Completions, ctx: &CompletionContext) {
.add_to(acc) .add_to(acc)
}); });
} }
hir::ModuleDef::Function(_) | hir::ModuleDef::Struct(_) | hir::ModuleDef::Def(_) => return, hir::ModuleDef::Function(_)
| hir::ModuleDef::Struct(_)
| hir::ModuleDef::Def(_)
| hir::ModuleDef::EnumVariant(_) => return,
}; };
} }

1
crates/ra_ide_api/src/completion/completion_item.rs
View File

@ -222,6 +222,7 @@ impl Builder {
hir::ModuleDef::Function(func) => return self.from_function(ctx, func), hir::ModuleDef::Function(func) => return self.from_function(ctx, func),
hir::ModuleDef::Struct(it) => (CompletionItemKind::Struct, it.docs(ctx.db)), hir::ModuleDef::Struct(it) => (CompletionItemKind::Struct, it.docs(ctx.db)),
hir::ModuleDef::Enum(it) => (CompletionItemKind::Enum, it.docs(ctx.db)), hir::ModuleDef::Enum(it) => (CompletionItemKind::Enum, it.docs(ctx.db)),
hir::ModuleDef::EnumVariant(it) => (CompletionItemKind::EnumVariant, it.docs(ctx.db)),
hir::ModuleDef::Def(def_id) => match def_id.resolve(ctx.db) { hir::ModuleDef::Def(def_id) => match def_id.resolve(ctx.db) {
hir::Def::Trait(it) => (CompletionItemKind::Trait, it.docs(ctx.db)), hir::Def::Trait(it) => (CompletionItemKind::Trait, it.docs(ctx.db)),
hir::Def::Type(it) => (CompletionItemKind::TypeAlias, it.docs(ctx.db)), hir::Def::Type(it) => (CompletionItemKind::TypeAlias, it.docs(ctx.db)),

11
crates/ra_ide_api/src/navigation_target.rs
View File

@ -128,13 +128,16 @@ impl NavigationTarget {
&*node, &*node,
)); ));
} }
hir::ModuleDef::EnumVariant(var) => {
let (file_id, node) = var.source(db);
return Some(NavigationTarget::from_named(
file_id.original_file(db),
&*node,
));
}
}; };
let res = match def { let res = match def {
Def::EnumVariant(ev) => {
let (file_id, node) = ev.source(db);
NavigationTarget::from_named(file_id.original_file(db), &*node)
}
Def::Trait(f) => { Def::Trait(f) => {
let (file_id, node) = f.source(db); let (file_id, node) = f.source(db);
NavigationTarget::from_named(file_id.original_file(db), &*node) NavigationTarget::from_named(file_id.original_file(db), &*node)