aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_ide/src/completion/complete_keyword.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_ide/src/completion/complete_keyword.rs')
-rw-r--r--crates/ra_ide/src/completion/complete_keyword.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/crates/ra_ide/src/completion/complete_keyword.rs b/crates/ra_ide/src/completion/complete_keyword.rs
index 5b56c6275..50f003949 100644
--- a/crates/ra_ide/src/completion/complete_keyword.rs
+++ b/crates/ra_ide/src/completion/complete_keyword.rs
@@ -62,7 +62,7 @@ fn add_keyword(
62pub(super) fn complete_expr_keyword(acc: &mut Completions, ctx: &CompletionContext) { 62pub(super) fn complete_expr_keyword(acc: &mut Completions, ctx: &CompletionContext) {
63 add_keyword(ctx, acc, "fn", "fn $0() {}", ctx.is_new_item || ctx.block_expr_parent); 63 add_keyword(ctx, acc, "fn", "fn $0() {}", ctx.is_new_item || ctx.block_expr_parent);
64 add_keyword(ctx, acc, "type", "type ", ctx.is_new_item || ctx.block_expr_parent); 64 add_keyword(ctx, acc, "type", "type ", ctx.is_new_item || ctx.block_expr_parent);
65 add_keyword(ctx, acc, "fn", "fn $0() {}", ctx.is_new_item || ctx.block_expr_parent); 65 add_keyword(ctx, acc, "use", "fn $0() {}", ctx.is_new_item || ctx.block_expr_parent);
66 add_keyword(ctx, acc, "impl", "impl $0 {}", ctx.is_new_item); 66 add_keyword(ctx, acc, "impl", "impl $0 {}", ctx.is_new_item);
67 add_keyword(ctx, acc, "trait", "impl $0 {}", ctx.is_new_item); 67 add_keyword(ctx, acc, "trait", "impl $0 {}", ctx.is_new_item);
68 add_keyword(ctx, acc, "enum", "enum $0 {}", ctx.is_new_item && !ctx.after_unsafe); 68 add_keyword(ctx, acc, "enum", "enum $0 {}", ctx.is_new_item && !ctx.after_unsafe);
@@ -72,7 +72,6 @@ pub(super) fn complete_expr_keyword(acc: &mut Completions, ctx: &CompletionConte
72 add_keyword(ctx, acc, "loop", "loop {$0}", ctx.block_expr_parent); 72 add_keyword(ctx, acc, "loop", "loop {$0}", ctx.block_expr_parent);
73 add_keyword(ctx, acc, "while", "while $0 {}", ctx.block_expr_parent); 73 add_keyword(ctx, acc, "while", "while $0 {}", ctx.block_expr_parent);
74 add_keyword(ctx, acc, "let", "let ", ctx.after_if || ctx.block_expr_parent); 74 add_keyword(ctx, acc, "let", "let ", ctx.after_if || ctx.block_expr_parent);
75 add_keyword(ctx, acc, "let", "let ", ctx.after_if || ctx.block_expr_parent);
76 add_keyword(ctx, acc, "else", "else {$0}", ctx.after_if); 75 add_keyword(ctx, acc, "else", "else {$0}", ctx.after_if);
77 add_keyword(ctx, acc, "else if", "else if $0 {}", ctx.after_if); 76 add_keyword(ctx, acc, "else if", "else if $0 {}", ctx.after_if);
78 add_keyword(ctx, acc, "mod", "mod $0 {}", ctx.is_new_item || ctx.block_expr_parent); 77 add_keyword(ctx, acc, "mod", "mod $0 {}", ctx.is_new_item || ctx.block_expr_parent);
@@ -88,6 +87,8 @@ pub(super) fn complete_expr_keyword(acc: &mut Completions, ctx: &CompletionConte
88 add_keyword(ctx, acc, "break", "break;", ctx.in_loop_body && ctx.can_be_stmt); 87 add_keyword(ctx, acc, "break", "break;", ctx.in_loop_body && ctx.can_be_stmt);
89 add_keyword(ctx, acc, "continue", "continue", ctx.in_loop_body && !ctx.can_be_stmt); 88 add_keyword(ctx, acc, "continue", "continue", ctx.in_loop_body && !ctx.can_be_stmt);
90 add_keyword(ctx, acc, "break", "break", ctx.in_loop_body && !ctx.can_be_stmt); 89 add_keyword(ctx, acc, "break", "break", ctx.in_loop_body && !ctx.can_be_stmt);
90 add_keyword(ctx, acc, "pub", "pub ", ctx.is_new_item && !ctx.inside_trait);
91 add_keyword(ctx, acc, "where", "where ", ctx.trait_as_prev_sibling || ctx.impl_as_prev_sibling);
91 complete_use_tree_keyword(acc, ctx); 92 complete_use_tree_keyword(acc, ctx);
92 93
93 let fn_def = match &ctx.function_syntax { 94 let fn_def = match &ctx.function_syntax {