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

Change postfix completion to keyword completion

Browse source
This commit is contained in:
Evgenii P 2019-08-03 02:40:59 +07:00
parent 291bd81e74
commit 40facb559a
1 changed files with 8 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

30
crates/ra_ide_api/src/completion/complete_dot.rs
View file

@ -10,25 +10,9 @@ use ra_syntax::TextRange;
use ra_text_edit::TextEditBuilder; use ra_text_edit::TextEditBuilder;
use rustc_hash::FxHashSet; use rustc_hash::FxHashSet;
/// Applies postfix edition but with CompletionKind::Reference
fn postfix_reference(ctx: &CompletionContext, label: &str, detail: &str, snippet: &str) -> Builder {
let edit = {
let receiver_range =
ctx.dot_receiver.as_ref().expect("no receiver available").syntax().text_range();
let delete_range = TextRange::from_to(receiver_range.start(), ctx.source_range().end());
let mut builder = TextEditBuilder::default();
builder.replace(delete_range, snippet.to_string());
builder.finish()
};
CompletionItem::new(CompletionKind::Reference, ctx.source_range(), label)
.detail(detail)
.snippet_edit(edit)
}
/// Complete dot accesses, i.e. fields or methods (and .await syntax). /// Complete dot accesses, i.e. fields or methods (and .await syntax).
pub(super) fn complete_dot(acc: &mut Completions, ctx: &CompletionContext) { pub(super) fn complete_dot(acc: &mut Completions, ctx: &CompletionContext) {
if let Some(dot_receiver) = &ctx.dot_receiver { if let Some(dot_receiver) = &ctx.dot_receiver {
let receiver_text = dot_receiver.syntax().text().to_string();
let receiver_ty = ctx.analyzer.type_of(ctx.db, &dot_receiver); let receiver_ty = ctx.analyzer.type_of(ctx.db, &dot_receiver);
if let Some(receiver_ty) = receiver_ty { if let Some(receiver_ty) = receiver_ty {
@ -39,7 +23,9 @@ pub(super) fn complete_dot(acc: &mut Completions, ctx: &CompletionContext) {
// Suggest .await syntax for types that implement Future trait // Suggest .await syntax for types that implement Future trait
if ctx.analyzer.impls_future(ctx.db, receiver_ty) { if ctx.analyzer.impls_future(ctx.db, receiver_ty) {
postfix_reference(ctx, ".await", "expr.await", &format!("{}.await", receiver_text)) CompletionItem::new(CompletionKind::Keyword, ctx.source_range(), "await")
.detail("expr.await")
.insert_text("await")
.add_to(acc); .add_to(acc);
} }
} }
@ -440,7 +426,7 @@ mod tests {
#[test] #[test]
fn test_completion_await_impls_future() { fn test_completion_await_impls_future() {
assert_debug_snapshot_matches!( assert_debug_snapshot_matches!(
do_ref_completion( do_completion(
r###" r###"
// Mock Future trait from stdlib // Mock Future trait from stdlib
pub mod std { pub mod std {
@ -457,14 +443,14 @@ mod tests {
fn foo(a: A) { fn foo(a: A) {
a.<|> a.<|>
} }
"###), "###, CompletionKind::Keyword),
@r###" @r###"
⋮[ ⋮[
⋮ CompletionItem { ⋮ CompletionItem {
⋮ label: ".await", ⋮ label: "await",
⋮ source_range: [358; 358), ⋮ source_range: [358; 358),
⋮ delete: [356; 358), ⋮ delete: [358; 358),
⋮ insert: "a.await", ⋮ insert: "await",
⋮ detail: "expr.await", ⋮ detail: "expr.await",
⋮ }, ⋮ },
⋮] ⋮]