aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--crates/hir_def/src/data.rs10
-rw-r--r--crates/hir_ty/src/tests/simple.rs19
2 files changed, 24 insertions, 5 deletions
diff --git a/crates/hir_def/src/data.rs b/crates/hir_def/src/data.rs
index e976e419e..2c70b3bc0 100644
--- a/crates/hir_def/src/data.rs
+++ b/crates/hir_def/src/data.rs
@@ -256,17 +256,17 @@ fn collect_items(
256 256
257 let mut items = Vec::new(); 257 let mut items = Vec::new();
258 for item in assoc_items { 258 for item in assoc_items {
259 let attrs = item_tree.attrs(db, module.krate, ModItem::from(item).into());
260 if !attrs.is_cfg_enabled(&cfg_options) {
261 continue;
262 }
263
259 match item { 264 match item {
260 AssocItem::Function(id) => { 265 AssocItem::Function(id) => {
261 let item = &item_tree[id]; 266 let item = &item_tree[id];
262 let attrs = item_tree.attrs(db, module.krate, ModItem::from(id).into());
263 if !attrs.is_cfg_enabled(&cfg_options) {
264 continue;
265 }
266 let def = FunctionLoc { container, id: ItemTreeId::new(file_id, id) }.intern(db); 267 let def = FunctionLoc { container, id: ItemTreeId::new(file_id, id) }.intern(db);
267 items.push((item.name.clone(), def.into())); 268 items.push((item.name.clone(), def.into()));
268 } 269 }
269 // FIXME: cfg?
270 AssocItem::Const(id) => { 270 AssocItem::Const(id) => {
271 let item = &item_tree[id]; 271 let item = &item_tree[id];
272 let name = match item.name.clone() { 272 let name = match item.name.clone() {
diff --git a/crates/hir_ty/src/tests/simple.rs b/crates/hir_ty/src/tests/simple.rs
index f5069eba5..bcc43ed70 100644
--- a/crates/hir_ty/src/tests/simple.rs
+++ b/crates/hir_ty/src/tests/simple.rs
@@ -2545,3 +2545,22 @@ fn test() {
2545 "#]], 2545 "#]],
2546 ) 2546 )
2547} 2547}
2548
2549#[test]
2550fn cfgd_out_assoc_items() {
2551 check_types(
2552 r#"
2553struct S;
2554
2555impl S {
2556 #[cfg(FALSE)]
2557 const C: S = S;
2558}
2559
2560fn f() {
2561 S::C;
2562 //^^^^ {unknown}
2563}
2564 "#,
2565 )
2566}