Merge #401

401: complete `crate` `self` and `super` in use stmt r=matklad a=gfreezy

fixed #387

Co-authored-by: gfreezy <[email protected]>

2 files changed, 68 insertions, 0 deletions

diff --git a/crates/ra_analysis/src/completion.rs b/crates/ra_analysis/src/completion.rs
index fe580700f..b4ee092b5 100644
--- a/crates/ra_analysis/src/completion.rs
+++ b/crates/ra_analysis/src/completion.rs
@@ -40,6 +40,7 @@ pub(crate) fn completions(
 
     complete_fn_param::complete_fn_param(&mut acc, &ctx);
     complete_keyword::complete_expr_keyword(&mut acc, &ctx);
+    complete_keyword::complete_use_tree_keyword(&mut acc, &ctx);
     complete_snippet::complete_expr_snippet(&mut acc, &ctx);
     complete_snippet::complete_item_snippet(&mut acc, &ctx);
     complete_path::complete_path(&mut acc, &ctx)?;
diff --git a/crates/ra_analysis/src/completion/complete_keyword.rs b/crates/ra_analysis/src/completion/complete_keyword.rs
index d70fdaada..28194c908 100644
--- a/crates/ra_analysis/src/completion/complete_keyword.rs
+++ b/crates/ra_analysis/src/completion/complete_keyword.rs
@@ -7,6 +7,38 @@ use ra_syntax::{
 
 use crate::completion::{CompletionContext, CompletionItem, Completions, CompletionKind, CompletionItemKind};
 
+pub(super) fn complete_use_tree_keyword(acc: &mut Completions, ctx: &CompletionContext) {
+    // complete keyword "crate" in use stmt
+    match (ctx.use_item_syntax.as_ref(), ctx.path_prefix.as_ref()) {
+        (Some(_), None) => {
+            CompletionItem::new(CompletionKind::Keyword, "crate")
+                .kind(CompletionItemKind::Keyword)
+                .lookup_by("crate")
+                .snippet("crate::")
+                .add_to(acc);
+            CompletionItem::new(CompletionKind::Keyword, "self")
+                .kind(CompletionItemKind::Keyword)
+                .lookup_by("self")
+                .add_to(acc);
+            CompletionItem::new(CompletionKind::Keyword, "super")
+                .kind(CompletionItemKind::Keyword)
+                .lookup_by("super")
+                .add_to(acc);
+        }
+        (Some(_), Some(_)) => {
+            CompletionItem::new(CompletionKind::Keyword, "self")
+                .kind(CompletionItemKind::Keyword)
+                .lookup_by("self")
+                .add_to(acc);
+            CompletionItem::new(CompletionKind::Keyword, "super")
+                .kind(CompletionItemKind::Keyword)
+                .lookup_by("super")
+                .add_to(acc);
+        }
+        _ => {}
+    }
+}
+
 fn keyword(kw: &str, snippet: &str) -> CompletionItem {
     CompletionItem::new(CompletionKind::Keyword, kw)
         .kind(CompletionItemKind::Keyword)
@@ -18,6 +50,7 @@ pub(super) fn complete_expr_keyword(acc: &mut Completions, ctx: &CompletionConte
     if !ctx.is_trivial_path {
         return;
     }
+
     let fn_def = match ctx.function_syntax {
         Some(it) => it,
         None => return,
@@ -80,6 +113,40 @@ mod tests {
     }
 
     #[test]
+    fn completes_keywords_in_use_stmt() {
+        check_keyword_completion(
+            r"
+            use <|>
+            ",
+            r#"
+            crate "crate" "crate::"
+            self "self"
+            super "super"
+            "#,
+        );
+
+        check_keyword_completion(
+            r"
+            use a::<|>
+            ",
+            r#"
+            self "self"
+            super "super"
+            "#,
+        );
+
+        check_keyword_completion(
+            r"
+            use a::{b, <|>}
+            ",
+            r#"
+            self "self"
+            super "super"
+            "#,
+        );
+    }
+
+    #[test]
     fn completes_various_keywords_in_function() {
         check_keyword_completion(
             r"