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

complete "use crate" for "use cr" too

Browse source
This commit is contained in:
gfreezy 2019-01-01 22:10:11 +08:00
parent fc2d7d1e1f
commit f408b1caa3
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -21,9 +21,20 @@ pub(super) fn complete_expr_keyword(acc: &mut Completions, ctx: &CompletionConte
// complete keyword "crate" in use stmt
if let (Some(use_item), None) = (&ctx.use_item_syntax, &ctx.path_prefix) {
if use_item.use_tree().is_none() {
let mut complete_crate = false;
let use_tree = use_item.use_tree();
if let Some(use_tree) = use_tree {
let tree_str = use_tree.syntax().text().to_string();
if tree_str != "crate" && "crate".starts_with(&tree_str) {
complete_crate = true;
}
} else {
complete_crate = true;
}
if complete_crate {
CompletionItem::new(CompletionKind::Keyword, "crate")
.kind(CompletionItemKind::Keyword)
.lookup_by("crate")
.add_to(acc);
}
}
@ -280,13 +291,14 @@ mod tests {
)
}
#[test]
fn completes_crate_in_use_stmt() {
check_keyword_completion(
r"
use <|>
",
r#"
crate
crate "crate"
"#,
);
// No completion: lambda isolates control flow