Refactor how builtins are resolved

This fixes autocompletion suggesting e.g. self::usize.

2 files changed, 7 insertions, 7 deletions

diff --git a/crates/ra_ide/src/completion/complete_path.rs b/crates/ra_ide/src/completion/complete_path.rs
index af24e9f48..2d7f09a6c 100644
--- a/crates/ra_ide/src/completion/complete_path.rs
+++ b/crates/ra_ide/src/completion/complete_path.rs
@@ -1,4 +1,4 @@
-//! FIXME: write short doc here
+//! Completion of paths, including when writing a single name.
 
 use hir::{Adt, PathResolution, ScopeDef};
 use ra_syntax::AstNode;
@@ -20,10 +20,6 @@ pub(super) fn complete_path(acc: &mut Completions, ctx: &CompletionContext) {
             let module_scope = module.scope(ctx.db);
             for (name, def) in module_scope {
                 if ctx.use_item_syntax.is_some() {
-                    if let hir::ScopeDef::ModuleDef(hir::ModuleDef::BuiltinType(..)) = def {
-                        tested_by!(dont_complete_primitive_in_use);
-                        continue;
-                    }
                     if let ScopeDef::Unknown = def {
                         if let Some(name_ref) = ctx.name_ref_syntax.as_ref() {
                             if name_ref.syntax().text() == name.to_string().as_str() {
@@ -125,12 +121,17 @@ mod tests {
 
     #[test]
     fn dont_complete_primitive_in_use() {
-        covers!(dont_complete_primitive_in_use);
         let completions = do_completion(r"use self::<|>;", CompletionKind::BuiltinType);
         assert!(completions.is_empty());
     }
 
     #[test]
+    fn dont_complete_primitive_in_module_scope() {
+        let completions = do_completion(r"fn foo() { self::<|> }", CompletionKind::BuiltinType);
+        assert!(completions.is_empty());
+    }
+
+    #[test]
     fn completes_primitives() {
         let completions =
             do_completion(r"fn main() { let _: <|> = 92; }", CompletionKind::BuiltinType);
diff --git a/crates/ra_ide/src/marks.rs b/crates/ra_ide/src/marks.rs
index 5bf4d2062..bcb67e373 100644
--- a/crates/ra_ide/src/marks.rs
+++ b/crates/ra_ide/src/marks.rs
@@ -10,6 +10,5 @@ test_utils::marks!(
     goto_def_for_field_init_shorthand
     call_info_bad_offset
     dont_complete_current_use
-    dont_complete_primitive_in_use
     test_resolve_parent_module_on_module_decl
 );