squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Merge #374

Browse source 
374: add semi after break&continue r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2018-12-30 16:25:30 +00:00
commit 942c45a31c
1 changed files with 33 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
crates/ra_analysis/src/completion/complete_keyword.rs
View file

@ -32,8 +32,13 @@ pub(super) fn complete_expr_keyword(acc: &mut Completions, ctx: &CompletionConte
acc.add(keyword("else if", "else if $0 {}"));
}
if is_in_loop_body(ctx.leaf) {
acc.add(keyword("continue", "continue"));
acc.add(keyword("break", "break"));
if ctx.can_be_stmt {
acc.add(keyword("continue", "continue;"));
acc.add(keyword("break", "break;"));
} else {
acc.add(keyword("continue", "continue"));
acc.add(keyword("break", "break"));
}
}
acc.add_all(complete_return(fn_def, ctx.can_be_stmt));
}
@ -201,8 +206,8 @@ mod tests {
match "match $0 {}"
while "while $0 {}"
loop "loop {$0}"
continue "continue"
break "break"
continue "continue;"
break "break;"
return "return $0;"
"#,
);
@ -222,4 +227,28 @@ mod tests {
"#,
);
}
#[test]
fn no_semi_after_break_continue_in_expr() {
check_keyword_completion(
r"
fn f() {
loop {
match () {
() => br<|>
}
}
}
",
r#"
if "if $0 {}"
match "match $0 {}"
while "while $0 {}"
loop "loop {$0}"
continue "continue"
break "break"
return "return"
"#,
)
}
}