3 files changed, 67 insertions, 77 deletions

diff --git a/crates/ra_analysis/src/completion.rs b/crates/ra_analysis/src/completion.rs
index a795dd767..b4ee092b5 100644
--- a/crates/ra_analysis/src/completion.rs
+++ b/crates/ra_analysis/src/completion.rs
@@ -7,7 +7,6 @@ mod complete_keyword;
 mod complete_snippet;
 mod complete_path;
 mod complete_scope;
-mod complete_use_tree;
 
 use ra_db::SyntaxDatabase;
 
@@ -41,12 +40,12 @@ 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)?;
     complete_scope::complete_scope(&mut acc, &ctx)?;
     complete_dot::complete_dot(&mut acc, &ctx)?;
-    complete_use_tree::complete_use_tree_keyword(&mut acc, &ctx);
 
     Ok(Some(acc))
 }
diff --git a/crates/ra_analysis/src/completion/complete_keyword.rs b/crates/ra_analysis/src/completion/complete_keyword.rs
index a381046e9..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)
@@ -81,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"
diff --git a/crates/ra_analysis/src/completion/complete_use_tree.rs b/crates/ra_analysis/src/completion/complete_use_tree.rs
deleted file mode 100644
index 5f2f6e449..000000000
--- a/crates/ra_analysis/src/completion/complete_use_tree.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-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);
-        }
-        _ => {}
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::completion::{CompletionKind, check_completion};
-    fn check_keyword_completion(code: &str, expected_completions: &str) {
-        check_completion(code, expected_completions, CompletionKind::Keyword);
-    }
-
-    #[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"
-            "#,
-        );
-    }
-}