From 7be2d2f008595114e19aad0aa0608ddedfe3edf7 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 22 Jun 2021 21:22:36 +0300 Subject: internal: remove one more accidentally quadratic code-path Definition::visibility was implemented in a rather roundabout way -- by asking the parent module about the effective visibility. This is problematic for a couple of reasons: * first, it doesn't work for local items * second, asking module about visibility of a child is a linear operation (that's a problem in itself, tracked in #9378) Instead, lets ask the declared visibility directly, we have all the code for it, and need only to actually us it. --- crates/ide_db/src/defs.rs | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) (limited to 'crates/ide_db') diff --git a/crates/ide_db/src/defs.rs b/crates/ide_db/src/defs.rs index a54f2c323..fddd1fc2d 100644 --- a/crates/ide_db/src/defs.rs +++ b/crates/ide_db/src/defs.rs @@ -43,13 +43,29 @@ impl Definition { pub fn visibility(&self, db: &RootDatabase) -> Option { match self { - Definition::Macro(_) => None, Definition::Field(sf) => Some(sf.visibility(db)), - Definition::ModuleDef(def) => def.definition_visibility(db), - Definition::SelfType(_) => None, - Definition::Local(_) => None, - Definition::GenericParam(_) => None, - Definition::Label(_) => None, + Definition::ModuleDef(def) => match def { + ModuleDef::Module(it) => { + // FIXME: should work like other cases here. + let parent = it.parent(db)?; + parent.visibility_of(db, def) + } + ModuleDef::Function(it) => Some(it.visibility(db)), + ModuleDef::Adt(it) => Some(it.visibility(db)), + ModuleDef::Const(it) => Some(it.visibility(db)), + ModuleDef::Static(it) => Some(it.visibility(db)), + ModuleDef::Trait(it) => Some(it.visibility(db)), + ModuleDef::TypeAlias(it) => Some(it.visibility(db)), + // NB: Variants don't have their own visibility, and just inherit + // one from the parent. Not sure if that's the right thing to do. + ModuleDef::Variant(it) => Some(it.parent_enum(db).visibility(db)), + ModuleDef::BuiltinType(_) => None, + }, + Definition::Macro(_) + | Definition::SelfType(_) + | Definition::Local(_) + | Definition::GenericParam(_) + | Definition::Label(_) => None, } } -- cgit v1.2.3