Move scope.extern_crates to return iterator and set module docs

Author: jmintb

crates/hir-def/src/resolver.rs

@@ -457,6 +457,7 @@ impl Resolver {
         def_map[module_id].scope.entries().for_each(|(name, def)| {
             res.add_per_ns(name, def);
         });
+
         def_map[module_id].scope.legacy_macros().for_each(|(name, macs)| {
             macs.iter().for_each(|&mac| {
                 res.add(name, ScopeDef::ModuleDef(ModuleDefId::MacroId(mac)));
@@ -490,8 +491,11 @@ impl Resolver {
             .map(|id| ExternCrateDeclData::extern_crate_decl_data_query(db, id).name.clone())
     }
 
-    pub fn extern_crates_in_scope(&self) -> Vec<Name> {
-        self.module_scope.def_map.extern_prelude().map(|(name, _)| name.clone()).collect()
+    pub fn extern_crates_in_scope<'a>(&'a self) -> impl Iterator<Item = (Name, ModuleId)> + 'a {
+        self.module_scope
+            .def_map
+            .extern_prelude()
+            .map(|(name, module_id)| (name.clone(), module_id))
     }
 
     pub fn traits_in_scope(&self, db: &dyn DefDatabase) -> FxHashSet<TraitId> {

crates/hir/src/semantics.rs

@@ -1684,9 +1684,8 @@ impl SemanticsScope<'_> {
         )
     }
 
-    pub fn extern_crates(&self) -> Vec<Name> {
-        println!("names in scope {:?}", self.resolver.names_in_scope(self.db.upcast()));
-        self.resolver.extern_crates_in_scope()
+    pub fn extern_crates(&self) -> impl Iterator<Item = (Name, Module)> + '_ {
+        self.resolver.extern_crates_in_scope().map(|(name, id)| (name, Module { id }))
     }
 
     pub fn extern_crate_decls(&self) -> impl Iterator<Item = Name> + '_ {

crates/ide-completion/src/completions/extern_crate.rs

@@ -1,6 +1,6 @@
 //! Completion for extern crates
 
-use hir::Name;
+use hir::{HasAttrs, Name};
 use ide_db::{FxHashSet, SymbolKind};
 use syntax::{
     ast::{self, NameRef},
@@ -18,7 +18,7 @@ pub(crate) fn complete_extern_crate(
 ) {
     let imported_extern_crates: Vec<Name> = ctx.scope.extern_crate_decls().collect();
 
-    for name in ctx.scope.extern_crates() {
+    for (name, module) in ctx.scope.extern_crates() {
         if imported_extern_crates.contains(&name) {
             continue;
         }
@@ -28,6 +28,7 @@ pub(crate) fn complete_extern_crate(
             ctx.source_range(),
             name.to_smol_str(),
         )
+        .set_documentation(module.docs(db))
         .add_to(acc, ctx.db);
     }
 }