Flatten implicit declarations

Author: kraigher

vhdl_lang/src/analysis/named_entity.rs

@@ -42,25 +42,23 @@ pub enum Type {
 }
 
 impl Type {
-    pub fn implicit_declarations(&self) -> Option<impl Iterator<Item = Arc<NamedEntity>> + '_> {
-        let implicit = match self {
-            Type::Array { ref implicit, .. } => implicit,
-            Type::Enum(ref implicit) => return Some(either::Either::Left(implicit.iter())),
-            Type::Integer(ref implicit) => implicit,
-            Type::Physical(ref implicit) => implicit,
-            Type::File(ref implicit) => implicit,
-            Type::Access(.., ref implicit) => implicit,
+    pub fn implicit_declarations(&self) -> impl Iterator<Item = Arc<NamedEntity>> + '_ {
+        match self {
+            Type::Array { ref implicit, .. } => Some(either::Either::Right(implicit.iter())),
+            Type::Enum(ref implicit) => Some(either::Either::Left(implicit.iter())),
+            Type::Integer(ref implicit) => Some(either::Either::Right(implicit.iter())),
+            Type::Physical(ref implicit) => Some(either::Either::Right(implicit.iter())),
+            Type::File(ref implicit) => Some(either::Either::Right(implicit.iter())),
+            Type::Access(.., ref implicit) => Some(either::Either::Right(implicit.iter())),
             Type::Incomplete(..)
             | Type::Interface
             | Type::Protected(..)
             | Type::Record(..)
             | Type::Subtype(..)
-            | Type::Alias(..) => {
-                return None;
-            }
-        };
-
-        Some(either::Either::Right(implicit.iter()))
+            | Type::Alias(..) => None,
+        }
+        .into_iter()
+        .flatten()
     }
 
     pub fn describe(&self) -> &str {
@@ -141,11 +139,13 @@ impl NamedEntityKind {
         matches!(self, NamedEntityKind::Type(..))
     }
 
-    pub fn implicit_declarations(&self) -> Option<impl Iterator<Item = Arc<NamedEntity>> + '_> {
+    pub fn implicit_declarations(&self) -> impl Iterator<Item = Arc<NamedEntity>> + '_ {
         match self {
-            NamedEntityKind::Type(typ) => typ.implicit_declarations(),
+            NamedEntityKind::Type(typ) => Some(typ.implicit_declarations()),
             _ => None,
         }
+        .into_iter()
+        .flatten()
     }
 
     pub fn describe(&self) -> &str {

vhdl_lang/src/analysis/region.rs

@@ -400,15 +400,13 @@ impl<'a> Region<'a> {
         ent: &NamedEntity,
         diagnostics: &mut dyn DiagnosticHandler,
     ) {
-        if let Some(implicit) = ent.actual_kind().implicit_declarations() {
-            for entity in implicit {
-                let entity = NamedEntity::implicit(
-                    entity.designator().clone(),
-                    NamedEntityKind::NonObjectAlias(entity.clone()),
-                    ent.decl_pos(),
-                );
-                self.add(Arc::new(entity), diagnostics);
-            }
+        for entity in ent.actual_kind().implicit_declarations() {
+            let entity = NamedEntity::implicit(
+                entity.designator().clone(),
+                NamedEntityKind::NonObjectAlias(entity.clone()),
+                ent.decl_pos(),
+            );
+            self.add(Arc::new(entity), diagnostics);
         }
     }
 

vhdl_lang/src/analysis/visibility.rs

@@ -90,14 +90,12 @@ impl Visibility {
     ) {
         // Add implicit declarations when using declaration
         // For example all enum literals are made implicititly visible when using an enum type
-        if let Some(implicit) = ent.actual_kind().implicit_declarations() {
-            for entity in implicit {
-                self.make_potentially_visible_with_name(
-                    visible_pos,
-                    entity.designator().clone(),
-                    entity.clone(),
-                );
-            }
+        for entity in ent.actual_kind().implicit_declarations() {
+            self.make_potentially_visible_with_name(
+                visible_pos,
+                entity.designator().clone(),
+                entity.clone(),
+            );
         }
 
         let visible_ent = VisibleEntity {