From 6458f9107ccda72e68acd80487dd44012edbdc39 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Wed, 3 Feb 2021 18:23:59 +0100 Subject: Add newline between block and crate maps --- crates/hir_def/src/body/tests/block.rs | 10 ++++++++++ crates/hir_def/src/nameres.rs | 1 + 2 files changed, 11 insertions(+) diff --git a/crates/hir_def/src/body/tests/block.rs b/crates/hir_def/src/body/tests/block.rs index d5f3ac4c5..062560a70 100644 --- a/crates/hir_def/src/body/tests/block.rs +++ b/crates/hir_def/src/body/tests/block.rs @@ -14,6 +14,7 @@ fn outer() { expect![[r#" block scope inner: v + crate inner: t outer: v @@ -38,6 +39,7 @@ fn outer() { CrateStruct: t v SelfStruct: t v Struct: t v + crate Struct: t v outer: v @@ -62,6 +64,7 @@ fn outer() { block scope imported: t v name: v + crate name: t outer: v @@ -88,9 +91,11 @@ fn outer() { inner1: t inner2: v outer: v + block scope inner: v inner1: t + crate outer: v "#]], @@ -113,6 +118,7 @@ struct Struct {} expect![[r#" block scope Struct: t + crate Struct: t module: t @@ -143,6 +149,7 @@ fn f() { expect![[r#" block scope Hit: t + crate f: v "#]], @@ -177,8 +184,10 @@ pub mod mark { expect![[r#" block scope Hit: t + block scope nested: v + crate f: v mark: t @@ -210,6 +219,7 @@ fn f() { expect![[r#" block scope Def: t + crate module: t diff --git a/crates/hir_def/src/nameres.rs b/crates/hir_def/src/nameres.rs index ef54f7d08..c858ea0c4 100644 --- a/crates/hir_def/src/nameres.rs +++ b/crates/hir_def/src/nameres.rs @@ -324,6 +324,7 @@ impl DefMap { let mut current_map = self; while let Some(block) = ¤t_map.block { go(&mut buf, current_map, "block scope", current_map.root); + buf.push('\n'); current_map = &*block.parent; } go(&mut buf, current_map, "crate", current_map.root); -- cgit v1.2.3