1 files changed, 33 insertions, 8 deletions
diff --git a/crates/hir_def/src/body/tests.rs b/crates/hir_def/src/body/tests.rs
index de77d5fc9..2e5d0a01e 100644
--- a/crates/hir_def/src/body/tests.rs
+++ b/crates/hir_def/src/body/tests.rs
@@ -6,18 +6,24 @@ use crate::{test_db::TestDB, ModuleDefId};
 use super::*;
 fn lower(ra_fixture: &str) -> Arc<Body> {
-    let (db, file_id) = crate::test_db::TestDB::with_single_file(ra_fixture);
+    let db = crate::test_db::TestDB::with_files(ra_fixture);
    let krate = db.crate_graph().iter().next().unwrap();
    let def_map = db.crate_def_map(krate);
-    let module = def_map.modules_for_file(file_id).next().unwrap();
+    let mut fn_def = None;
-    let module = &def_map[module];
+    'outer: for (_, module) in def_map.modules() {
-    let fn_def = match module.scope.declarations().next().unwrap() {
+        for decl in module.scope.declarations() {
-        ModuleDefId::FunctionId(it) => it,
+            match decl {
-        _ => panic!(),
+                ModuleDefId::FunctionId(it) => {
-    };
+                    fn_def = Some(it);
+                    break 'outer;
+                }
+                _ => {}
+            }
+        }
+    }
-    db.body(fn_def.into())
+    db.body(fn_def.unwrap().into())
 }
 fn check_diagnostics(ra_fixture: &str) {
@@ -42,6 +48,25 @@ fn main() { n_nuple!(1,2,3); }
 }
 #[test]
+fn macro_resolve() {
+    // Regression test for a path resolution bug introduced with inner item handling.
+    lower(
+        r"
+macro_rules! vec {
+    () => { () };
+    ($elem:expr; $n:expr) => { () };
+    ($($x:expr),+ $(,)?) => { () };
+}
+mod m {
+    fn outer() {
+        let _ = vec![FileSet::default(); self.len()];
+    }
+}
+      ",
+    );
+}
+#[test]
 fn cfg_diagnostics() {
    check_diagnostics(
        r"

diff --git a/crates/hir_def/src/body/tests.rs b/crates/hir_def/src/body/tests.rs index de77d5fc9..2e5d0a01e 100644 --- a/crates/hir_def/src/body/tests.rs +++ b/crates/hir_def/src/body/tests.rs
@@ -6,18 +6,24 @@ use crate::{test_db::TestDB, ModuleDefId};
6	use super::*;	6	use super::*;
7		7
8	fn lower(ra_fixture: &str) -> Arc<Body> {	8	fn lower(ra_fixture: &str) -> Arc<Body> {
9	let (db, file_id) = crate::test_db::TestDB::with_single_file(ra_fixture);	9	let db = crate::test_db::TestDB::with_files(ra_fixture);
10		10
11	let krate = db.crate_graph().iter().next().unwrap();	11	let krate = db.crate_graph().iter().next().unwrap();
12	let def_map = db.crate_def_map(krate);	12	let def_map = db.crate_def_map(krate);
13	let module = def_map.modules_for_file(file_id).next().unwrap();	13	let mut fn_def = None;
14	let module = &def_map[module];	14	'outer: for (_, module) in def_map.modules() {
15	let fn_def = match module.scope.declarations().next().unwrap() {	15	for decl in module.scope.declarations() {
16	ModuleDefId::FunctionId(it) => it,	16	match decl {
17	_ => panic!(),	17	ModuleDefId::FunctionId(it) => {
18	};	18	fn_def = Some(it);
		19	break 'outer;
		20	}
		21	_ => {}
		22	}
		23	}
		24	}
19		25
20	db.body(fn_def.into())	26	db.body(fn_def.unwrap().into())
21	}	27	}
22		28
23	fn check_diagnostics(ra_fixture: &str) {	29	fn check_diagnostics(ra_fixture: &str) {
@@ -42,6 +48,25 @@ fn main() { n_nuple!(1,2,3); }
42	}	48	}
43		49
44	#[test]	50	#[test]
		51	fn macro_resolve() {
		52	// Regression test for a path resolution bug introduced with inner item handling.
		53	lower(
		54	r"
		55	macro_rules! vec {
		56	() => { () };
		57	($elem:expr; $n:expr) => { () };
		58	($($x:expr),+ $(,)?) => { () };
		59	}
		60	mod m {
		61	fn outer() {
		62	let _ = vec![FileSet::default(); self.len()];
		63	}
		64	}
		65	",
		66	);
		67	}
		68
		69	#[test]
45	fn cfg_diagnostics() {	70	fn cfg_diagnostics() {
46	check_diagnostics(	71	check_diagnostics(
47	r"	72	r"