fix symbol index collection not collecting legacy macros

Author: Veykril

crates/hir/src/symbols.rs

@@ -174,6 +174,13 @@ impl<'a> SymbolCollector<'a> {
         for const_id in scope.unnamed_consts() {
             self.collect_from_body(const_id);
         }
+
+        for (_, id) in scope.legacy_macros() {
+            let loc = id.lookup(self.db.upcast());
+            if loc.container == module_id {
+                self.push_decl(id, FileSymbolKind::Macro);
+            }
+        }
     }
 
     fn collect_from_body(&mut self, body_id: impl Into<DefWithBodyId>) {

crates/hir_def/src/item_scope.rs

@@ -128,9 +128,7 @@ impl ItemScope {
     }
 
     /// Iterate over all legacy textual scoped macros visible at the end of the module
-    pub(crate) fn legacy_macros<'a>(
-        &'a self,
-    ) -> impl Iterator<Item = (&'a Name, MacroRulesId)> + 'a {
+    pub fn legacy_macros<'a>(&'a self) -> impl Iterator<Item = (&'a Name, MacroRulesId)> + 'a {
         self.legacy_macros.iter().map(|(name, def)| (name, *def))
     }
 

crates/ide_db/src/symbol_index.rs

@@ -425,7 +425,11 @@ struct StructInModB;
         let symbols: Vec<_> = Crate::from(db.test_crate())
             .modules(&db)
             .into_iter()
-            .map(|module_id| (module_id, SymbolCollector::collect(&db, module_id)))
+            .map(|module_id| {
+                let mut symbols = SymbolCollector::collect(&db, module_id);
+                symbols.sort_by_key(|it| it.name.clone());
+                (module_id, symbols)
+            })
             .collect();
 
         expect_file!["./test_data/test_symbol_index_collection.txt"].assert_debug_eq(&symbols);