2 files changed, 17 insertions, 20 deletions

diff --git a/crates/ra_ide/src/completion/complete_keyword.rs b/crates/ra_ide/src/completion/complete_keyword.rs
index b2f621a11..3b174f916 100644
--- a/crates/ra_ide/src/completion/complete_keyword.rs
+++ b/crates/ra_ide/src/completion/complete_keyword.rs
@@ -11,14 +11,14 @@ pub(super) fn complete_use_tree_keyword(acc: &mut Completions, ctx: &CompletionC
     let source_range = ctx.source_range();
     match (ctx.use_item_syntax.as_ref(), ctx.path_prefix.as_ref()) {
         (Some(_), None) => {
-            CompletionItem::new(CompletionKind::Keyword, source_range, "crate")
+            CompletionItem::new(CompletionKind::Keyword, source_range, "crate::")
                 .kind(CompletionItemKind::Keyword)
                 .insert_text("crate::")
                 .add_to(acc);
             CompletionItem::new(CompletionKind::Keyword, source_range, "self")
                 .kind(CompletionItemKind::Keyword)
                 .add_to(acc);
-            CompletionItem::new(CompletionKind::Keyword, source_range, "super")
+            CompletionItem::new(CompletionKind::Keyword, source_range, "super::")
                 .kind(CompletionItemKind::Keyword)
                 .insert_text("super::")
                 .add_to(acc);
@@ -27,7 +27,7 @@ pub(super) fn complete_use_tree_keyword(acc: &mut Completions, ctx: &CompletionC
             CompletionItem::new(CompletionKind::Keyword, source_range, "self")
                 .kind(CompletionItemKind::Keyword)
                 .add_to(acc);
-            CompletionItem::new(CompletionKind::Keyword, source_range, "super")
+            CompletionItem::new(CompletionKind::Keyword, source_range, "super::")
                 .kind(CompletionItemKind::Keyword)
                 .insert_text("super::")
                 .add_to(acc);
@@ -182,9 +182,9 @@ mod tests {
         assert_snapshot!(
             get_keyword_completions(r"use <|>"),
             @r###"
-            kw crate
+            kw crate::
             kw self
-            kw super
+            kw super::
         "###
         );
 
@@ -192,7 +192,7 @@ mod tests {
             get_keyword_completions(r"use a::<|>"),
             @r###"
             kw self
-            kw super
+            kw super::
         "###
         );
 
@@ -200,7 +200,7 @@ mod tests {
             get_keyword_completions(r"use a::{b, <|>}"),
             @r###"
             kw self
-            kw super
+            kw super::
         "###
         );
     }
diff --git a/crates/ra_ide/src/completion/test_utils.rs b/crates/ra_ide/src/completion/test_utils.rs
index a1b7c1193..5c01654cc 100644
--- a/crates/ra_ide/src/completion/test_utils.rs
+++ b/crates/ra_ide/src/completion/test_utils.rs
@@ -1,21 +1,18 @@
 //! Runs completion for testing purposes.
 
+use hir::Semantics;
+use ra_syntax::{AstNode, NodeOrToken, SyntaxElement};
+
 use crate::{
     completion::{completion_item::CompletionKind, CompletionConfig},
     mock_analysis::analysis_and_position,
     CompletionItem,
 };
-use hir::Semantics;
-use ra_syntax::{AstNode, NodeOrToken, SyntaxElement};
 
 pub(crate) fn do_completion(code: &str, kind: CompletionKind) -> Vec<CompletionItem> {
     do_completion_with_options(code, kind, &CompletionConfig::default())
 }
 
-pub(crate) fn completion_list(code: &str, kind: CompletionKind) -> String {
-    completion_list_with_options(code, kind, &CompletionConfig::default())
-}
-
 pub(crate) fn do_completion_with_options(
     code: &str,
     kind: CompletionKind,
@@ -29,13 +26,8 @@ pub(crate) fn do_completion_with_options(
     kind_completions
 }
 
-fn get_all_completion_items(code: &str, options: &CompletionConfig) -> Vec<CompletionItem> {
-    let (analysis, position) = if code.contains("//-") {
-        analysis_and_position(code)
-    } else {
-        analysis_and_position(code)
-    };
-    analysis.completions(options, position).unwrap().unwrap().into()
+pub(crate) fn completion_list(code: &str, kind: CompletionKind) -> String {
+    completion_list_with_options(code, kind, &CompletionConfig::default())
 }
 
 pub(crate) fn completion_list_with_options(
@@ -65,3 +57,8 @@ pub(crate) fn check_pattern_is_applicable(code: &str, check: fn(SyntaxElement) -
         })
         .unwrap();
 }
+
+fn get_all_completion_items(code: &str, options: &CompletionConfig) -> Vec<CompletionItem> {
+    let (analysis, position) = analysis_and_position(code);
+    analysis.completions(options, position).unwrap().unwrap().into()
+}