From 38af81f183504145bd3bf6ba5bc40b3e41e04593 Mon Sep 17 00:00:00 2001 From: Paul Daniel Faria Date: Tue, 23 Jun 2020 22:10:01 -0400 Subject: Account for updated module ids when determining whether a resolution is "changed" --- crates/ra_hir_def/src/nameres/tests/globs.rs | 146 +++++++++++++++++++++++++++ 1 file changed, 146 insertions(+) (limited to 'crates/ra_hir_def/src/nameres/tests/globs.rs') diff --git a/crates/ra_hir_def/src/nameres/tests/globs.rs b/crates/ra_hir_def/src/nameres/tests/globs.rs index 2b12c0daa..f0d85d301 100644 --- a/crates/ra_hir_def/src/nameres/tests/globs.rs +++ b/crates/ra_hir_def/src/nameres/tests/globs.rs @@ -229,3 +229,149 @@ fn glob_enum_group() { "### ); } + +#[test] +fn glob_shadowed_def() { + let db = TestDB::with_files( + r###" + //- /lib.rs + mod foo; + mod bar; + + use foo::*; + use bar::Baz; + + //- /foo.rs + pub struct Baz; + + //- /bar.rs + pub struct Baz; + "###, + ); + let krate = db.test_crate(); + + let crate_def_map = db.crate_def_map(krate); + let (_, root_module) = crate_def_map + .modules + .iter() + .find(|(_, module_data)| module_data.parent.is_none()) + .expect("Root module not found"); + let visible_entries = root_module.scope.entries().collect::>(); + insta::assert_debug_snapshot!( + visible_entries, + @r###" + [ + ( + Name( + Text( + "Baz", + ), + ), + PerNs { + types: Some( + ( + AdtId( + StructId( + StructId( + 1, + ), + ), + ), + Module( + ModuleId { + krate: CrateId( + 0, + ), + local_id: Idx::(0), + }, + ), + ), + ), + values: Some( + ( + AdtId( + StructId( + StructId( + 1, + ), + ), + ), + Module( + ModuleId { + krate: CrateId( + 0, + ), + local_id: Idx::(0), + }, + ), + ), + ), + macros: None, + }, + ), + ( + Name( + Text( + "bar", + ), + ), + PerNs { + types: Some( + ( + ModuleId( + ModuleId { + krate: CrateId( + 0, + ), + local_id: Idx::(2), + }, + ), + Module( + ModuleId { + krate: CrateId( + 0, + ), + local_id: Idx::(0), + }, + ), + ), + ), + values: None, + macros: None, + }, + ), + ( + Name( + Text( + "foo", + ), + ), + PerNs { + types: Some( + ( + ModuleId( + ModuleId { + krate: CrateId( + 0, + ), + local_id: Idx::(1), + }, + ), + Module( + ModuleId { + krate: CrateId( + 0, + ), + local_id: Idx::(0), + }, + ), + ), + ), + values: None, + macros: None, + }, + ), + ] + "### + ); +} -- cgit v1.2.3 From dfd79907b80e1a93b93e99aaf4d7af2a84c1c59f Mon Sep 17 00:00:00 2001 From: Paul Daniel Faria Date: Wed, 24 Jun 2020 08:20:41 -0400 Subject: Use a macro in push_res to simplify code, simplify glob_shadowed_def assertion --- crates/ra_hir_def/src/nameres/tests/globs.rs | 155 +++++---------------------- 1 file changed, 28 insertions(+), 127 deletions(-) (limited to 'crates/ra_hir_def/src/nameres/tests/globs.rs') diff --git a/crates/ra_hir_def/src/nameres/tests/globs.rs b/crates/ra_hir_def/src/nameres/tests/globs.rs index f0d85d301..f117b0362 100644 --- a/crates/ra_hir_def/src/nameres/tests/globs.rs +++ b/crates/ra_hir_def/src/nameres/tests/globs.rs @@ -232,146 +232,47 @@ fn glob_enum_group() { #[test] fn glob_shadowed_def() { - let db = TestDB::with_files( + mark::check!(import_shadowed); + let map = def_map( r###" //- /lib.rs mod foo; mod bar; use foo::*; - use bar::Baz; + use bar::baz; + + use baz::Bar; //- /foo.rs - pub struct Baz; + pub mod baz { + pub struct Foo; + } //- /bar.rs - pub struct Baz; + pub mod baz { + pub struct Bar; + } "###, ); - let krate = db.test_crate(); + assert_snapshot!(map, @r###" + crate + Bar: t v + bar: t + baz: t + foo: t + + crate::bar + baz: t + + crate::bar::baz + Bar: t v + + crate::foo + baz: t - let crate_def_map = db.crate_def_map(krate); - let (_, root_module) = crate_def_map - .modules - .iter() - .find(|(_, module_data)| module_data.parent.is_none()) - .expect("Root module not found"); - let visible_entries = root_module.scope.entries().collect::>(); - insta::assert_debug_snapshot!( - visible_entries, - @r###" - [ - ( - Name( - Text( - "Baz", - ), - ), - PerNs { - types: Some( - ( - AdtId( - StructId( - StructId( - 1, - ), - ), - ), - Module( - ModuleId { - krate: CrateId( - 0, - ), - local_id: Idx::(0), - }, - ), - ), - ), - values: Some( - ( - AdtId( - StructId( - StructId( - 1, - ), - ), - ), - Module( - ModuleId { - krate: CrateId( - 0, - ), - local_id: Idx::(0), - }, - ), - ), - ), - macros: None, - }, - ), - ( - Name( - Text( - "bar", - ), - ), - PerNs { - types: Some( - ( - ModuleId( - ModuleId { - krate: CrateId( - 0, - ), - local_id: Idx::(2), - }, - ), - Module( - ModuleId { - krate: CrateId( - 0, - ), - local_id: Idx::(0), - }, - ), - ), - ), - values: None, - macros: None, - }, - ), - ( - Name( - Text( - "foo", - ), - ), - PerNs { - types: Some( - ( - ModuleId( - ModuleId { - krate: CrateId( - 0, - ), - local_id: Idx::(1), - }, - ), - Module( - ModuleId { - krate: CrateId( - 0, - ), - local_id: Idx::(0), - }, - ), - ), - ), - values: None, - macros: None, - }, - ), - ] + crate::foo::baz + Foo: t v "### ); } -- cgit v1.2.3 From 43c6f6c039985923c3039808834892206c81684d Mon Sep 17 00:00:00 2001 From: Paul Daniel Faria Date: Wed, 24 Jun 2020 08:50:59 -0400 Subject: Fix formatting issue with glob shadow test --- crates/ra_hir_def/src/nameres/tests/globs.rs | 34 ++++++++++++++-------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'crates/ra_hir_def/src/nameres/tests/globs.rs') diff --git a/crates/ra_hir_def/src/nameres/tests/globs.rs b/crates/ra_hir_def/src/nameres/tests/globs.rs index f117b0362..2f440975a 100644 --- a/crates/ra_hir_def/src/nameres/tests/globs.rs +++ b/crates/ra_hir_def/src/nameres/tests/globs.rs @@ -256,23 +256,23 @@ fn glob_shadowed_def() { "###, ); assert_snapshot!(map, @r###" - crate - Bar: t v - bar: t - baz: t - foo: t - - crate::bar - baz: t - - crate::bar::baz - Bar: t v - - crate::foo - baz: t - - crate::foo::baz - Foo: t v + ⋮crate + ⋮Bar: t v + ⋮bar: t + ⋮baz: t + ⋮foo: t + ⋮ + ⋮crate::bar + ⋮baz: t + ⋮ + ⋮crate::bar::baz + ⋮Bar: t v + ⋮ + ⋮crate::foo + ⋮baz: t + ⋮ + ⋮crate::foo::baz + ⋮Foo: t v "### ); } -- cgit v1.2.3