Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 13:03:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Smart return completion

Browse source
This commit is contained in:
Aleksey Kladov 2018-08-28 21:14:13 +03:00
parent 2257c08cb1
commit d351ae67a9
1 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
crates/libeditor/src/completion.rs
View file

@ -75,9 +75,13 @@ fn complete_keywords(file: &File, fn_def: Option<ast::FnDef>, name_ref: ast::Nam
} }
} }
// if let Some(fn_def) = fn_def { if let Some(fn_def) = fn_def {
// acc.push(keyword("return", "")) if fn_def.ret_type().is_some() {
// } acc.push(keyword("return", "return $0;"))
} else {
acc.push(keyword("return", "return;"))
}
}
fn keyword(kw: &str, snip: &str) -> CompletionItem { fn keyword(kw: &str, snip: &str) -> CompletionItem {
CompletionItem { CompletionItem {
@ -189,7 +193,8 @@ mod tests {
", r#"[CompletionItem { name: "if", snippet: Some("if $0 { }") }, ", r#"[CompletionItem { name: "if", snippet: Some("if $0 { }") },
CompletionItem { name: "match", snippet: Some("match $0 { }") }, CompletionItem { name: "match", snippet: Some("match $0 { }") },
CompletionItem { name: "while", snippet: Some("while $0 { }") }, CompletionItem { name: "while", snippet: Some("while $0 { }") },
CompletionItem { name: "loop", snippet: Some("loop {$0}") }]"#); CompletionItem { name: "loop", snippet: Some("loop {$0}") },
CompletionItem { name: "return", snippet: Some("return;") }]"#);
} }
#[test] #[test]
@ -205,6 +210,20 @@ mod tests {
CompletionItem { name: "while", snippet: Some("while $0 { }") }, CompletionItem { name: "while", snippet: Some("while $0 { }") },
CompletionItem { name: "loop", snippet: Some("loop {$0}") }, CompletionItem { name: "loop", snippet: Some("loop {$0}") },
CompletionItem { name: "else", snippet: Some("else {$0}") }, CompletionItem { name: "else", snippet: Some("else {$0}") },
CompletionItem { name: "else if", snippet: Some("else if $0 { }") }]"#); CompletionItem { name: "else if", snippet: Some("else if $0 { }") },
CompletionItem { name: "return", snippet: Some("return;") }]"#);
}
#[test]
fn test_completion_return_value() {
check_snippet_completion(r"
fn quux() -> i32{
<|>
}
", r#"[CompletionItem { name: "if", snippet: Some("if $0 { }") },
CompletionItem { name: "match", snippet: Some("match $0 { }") },
CompletionItem { name: "while", snippet: Some("while $0 { }") },
CompletionItem { name: "loop", snippet: Some("loop {$0}") },
CompletionItem { name: "return", snippet: Some("return $0;") }]"#);
} }
} }