nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-14 02:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplify

Browse Source
This commit is contained in:
Lukas Wirth 2021-05-15 01:09:53 +02:00
parent e5e6c363dc
commit 5b247780d4
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
crates/ide_completion/src/completions/keyword.rs
View File

@ -9,22 +9,21 @@ use crate::{CompletionContext, CompletionItem, CompletionItemKind, CompletionKin
pub(crate) fn complete_use_tree_keyword(acc: &mut Completions, ctx: &CompletionContext) { pub(crate) fn complete_use_tree_keyword(acc: &mut Completions, ctx: &CompletionContext) {
// complete keyword "crate" in use stmt // complete keyword "crate" in use stmt
let source_range = ctx.source_range(); let source_range = ctx.source_range();
let kw_completion = move |text: &str| {
let mut item = CompletionItem::new(CompletionKind::Keyword, source_range, text);
item.kind(CompletionItemKind::Keyword).insert_text(text);
item
};
if ctx.use_item_syntax.is_some() { if ctx.use_item_syntax.is_some() {
if ctx.path_qual.is_none() { if ctx.path_qual.is_none() {
let mut item = CompletionItem::new(CompletionKind::Keyword, source_range, "crate::"); kw_completion("crate::").add_to(acc);
item.kind(CompletionItemKind::Keyword).insert_text("crate::");
item.add_to(acc);
} }
let mut item = CompletionItem::new(CompletionKind::Keyword, source_range, "self"); kw_completion("self").add_to(acc);
item.kind(CompletionItemKind::Keyword);
item.add_to(acc);
if iter::successors(ctx.path_qual.clone(), |p| p.qualifier()) if iter::successors(ctx.path_qual.clone(), |p| p.qualifier())
.all(|p| p.segment().and_then(|s| s.super_token()).is_some()) .all(|p| p.segment().and_then(|s| s.super_token()).is_some())
{ {
let mut item = CompletionItem::new(CompletionKind::Keyword, source_range, "super::"); kw_completion("super::").add_to(acc);
item.kind(CompletionItemKind::Keyword).insert_text("super::");
item.add_to(acc);
} }
} }
@ -32,9 +31,8 @@ pub(crate) fn complete_use_tree_keyword(acc: &mut Completions, ctx: &CompletionC
if let Some(receiver) = &ctx.dot_receiver { if let Some(receiver) = &ctx.dot_receiver {
if let Some(ty) = ctx.sema.type_of_expr(receiver) { if let Some(ty) = ctx.sema.type_of_expr(receiver) {
if ty.impls_future(ctx.db) { if ty.impls_future(ctx.db) {
let mut item = let mut item = kw_completion("await");
CompletionItem::new(CompletionKind::Keyword, ctx.source_range(), "await"); item.detail("expr.await");
item.kind(CompletionItemKind::Keyword).detail("expr.await").insert_text("await");
item.add_to(acc); item.add_to(acc);
} }
}; };