More Refactor disconnect, package body and package declaration

Author: Chris44442

vhdl_lang/src/analysis/tests/declarations.rs

@@ -3,7 +3,7 @@
 // You can obtain one at http://mozilla.org/MPL/2.0/.
 //
 // Copyright (c) 2023, Olof Kraigher [email protected]
-use crate::analysis::tests::{check_diagnostics, LibraryBuilder};
+use crate::analysis::tests::{check_diagnostics, check_no_diagnostics, LibraryBuilder};
 use crate::data::error_codes::ErrorCode;
 use crate::Diagnostic;
 
@@ -116,7 +116,7 @@ begin
 end arch;
     ",
     );
-    check_diagnostics(builder.analyze(), vec![])
+    check_no_diagnostics(&builder.analyze())
 }
 
 #[test]

vhdl_lang/src/ast.rs

@@ -1383,7 +1383,7 @@ pub struct ConfigurationSpecification {
 pub enum GuardedSignalList {
     All,
     Others,
-    Ident(WithDecl<Ident>)
+    Ident(WithDecl<Vec<Ident>>),
 }
 
 /// LRM 7.4 Disconnection specification

vhdl_lang/src/ast/display.rs

@@ -1142,11 +1142,7 @@ impl Display for ConfigurationDeclaration {
 
 impl Display for DisconnectionSpecification {
     fn fmt(&self, f: &mut Formatter<'_>) -> Result {
-        if let Some(ident) = &self.ident {
-            write!(f, "disconnection {}", ident)
-        } else {
-            write!(f, "disconnection")
-        }
+        write!(f, "disconnection")
     }
 }
 

vhdl_lang/src/named_entity.rs

@@ -7,10 +7,10 @@
 use crate::ast::{
     AliasDeclaration, AnyDesignUnit, AnyPrimaryUnit, AnySecondaryUnit, Attribute,
     AttributeDeclaration, AttributeSpecification, ComponentDeclaration, Declaration, Designator,
-    DisconnectionSpecification, FileDeclaration, HasIdent, Ident, InterfaceFileDeclaration,
-    InterfacePackageDeclaration, ModeViewDeclaration, ObjectClass, ObjectDeclaration, PackageBody,
-    PackageDeclaration, PackageInstantiation, SubprogramBody, SubprogramInstantiation,
-    SubprogramSpecification, TypeDeclaration, WithDecl,
+    DisconnectionSpecification, FileDeclaration, GuardedSignalList, HasIdent, Ident,
+    InterfaceFileDeclaration, InterfacePackageDeclaration, ModeViewDeclaration, ObjectClass,
+    ObjectDeclaration, PackageBody, PackageDeclaration, PackageInstantiation, SubprogramBody,
+    SubprogramInstantiation, SubprogramSpecification, TypeDeclaration, WithDecl,
 };
 use crate::ast::{ExternalObjectClass, InterfaceDeclaration, InterfaceObjectDeclaration};
 use crate::data::*;
@@ -662,7 +662,10 @@ impl HasEntityId for PackageDeclaration {
 
 impl HasEntityId for DisconnectionSpecification {
     fn ent_id(&self) -> Option<EntityId> {
-        self.ident.as_ref().and_then(|ident| ident.decl.get())
+        match &self.ident {
+            GuardedSignalList::Ident(with_decl) => with_decl.decl.get(),
+            _ => None,
+        }
     }
 }