1 files changed, 25 insertions, 0 deletions

diff --git a/crates/hir_def/src/nameres/tests/block.rs b/crates/hir_def/src/nameres/tests/block.rs
index 996704308..ab7ec9d62 100644
--- a/crates/hir_def/src/nameres/tests/block.rs
+++ b/crates/hir_def/src/nameres/tests/block.rs
@@ -45,3 +45,28 @@ fn outer() {
         "#]],
     );
 }
+
+#[test]
+fn merge_namespaces() {
+    check_at(
+        r#"
+//- /lib.rs
+struct name {}
+fn outer() {
+    fn name() {}
+
+    use name as imported; // should import both `name`s
+
+    $0
+}
+"#,
+        expect![[r#"
+            block scope
+            imported: t v
+            name: v
+            crate
+            name: t
+            outer: v
+        "#]],
+    );
+}