language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 14:21:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge #5297

Browse source 
5297: Better name r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2020-07-10 15:57:18 +00:00 • committed by GitHub
commit a6ac5ac742
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/ra_ide/src/completion/complete_keyword.rs
View file

@ -92,7 +92,7 @@ pub(super) fn complete_expr_keyword(acc: &mut Completions, ctx: &CompletionConte
add_keyword(ctx, acc, "union", "union $0 {}"); add_keyword(ctx, acc, "union", "union $0 {}");
} }
if ctx.can_be_expr { if ctx.is_expr {
add_keyword(ctx, acc, "match", "match $0 {}"); add_keyword(ctx, acc, "match", "match $0 {}");
add_keyword(ctx, acc, "while", "while $0 {}"); add_keyword(ctx, acc, "while", "while $0 {}");
add_keyword(ctx, acc, "loop", "loop {$0}"); add_keyword(ctx, acc, "loop", "loop {$0}");

6
crates/ra_ide/src/completion/completion_context.rs
View file

@ -54,7 +54,7 @@ pub(crate) struct CompletionContext<'a> {
/// `true` if we are a statement or a last expr in the block. /// `true` if we are a statement or a last expr in the block.
pub(super) can_be_stmt: bool, pub(super) can_be_stmt: bool,
/// `true` if we expect an expression at the cursor position. /// `true` if we expect an expression at the cursor position.
pub(super) can_be_expr: bool, pub(super) is_expr: bool,
/// Something is typed at the "top" level, in module or impl/trait. /// Something is typed at the "top" level, in module or impl/trait.
pub(super) is_new_item: bool, pub(super) is_new_item: bool,
/// The receiver if this is a field or method access, i.e. writing something.<|> /// The receiver if this is a field or method access, i.e. writing something.<|>
@ -129,7 +129,7 @@ impl<'a> CompletionContext<'a> {
path_prefix: None, path_prefix: None,
after_if: false, after_if: false,
can_be_stmt: false, can_be_stmt: false,
can_be_expr: false, is_expr: false,
is_new_item: false, is_new_item: false,
dot_receiver: None, dot_receiver: None,
is_call: false, is_call: false,
@ -406,7 +406,7 @@ impl<'a> CompletionContext<'a> {
None None
}) })
.unwrap_or(false); .unwrap_or(false);
self.can_be_expr = path.syntax().parent().and_then(ast::PathExpr::cast).is_some(); self.is_expr = path.syntax().parent().and_then(ast::PathExpr::cast).is_some();
if let Some(off) = name_ref.syntax().text_range().start().checked_sub(2.into()) { if let Some(off) = name_ref.syntax().text_range().start().checked_sub(2.into()) {
if let Some(if_expr) = if let Some(if_expr) =