Ensure protected type body map to non-body in signatures

Author: kraigher

vhdl_lang/src/analysis/named_entity/types.rs

@@ -145,6 +145,18 @@ impl<'a> TypeEnt<'a> {
         match self.kind() {
             Type::Alias(alias) => alias.base_type(),
             Type::Subtype(subtype) => subtype.base_type(),
+            Type::Protected(.., is_body) if *is_body => {
+                // Never use the protected type body in signatures, use the non-body
+                if let Related::DeclaredBy(other) = self.related {
+                    if let Some(typ) = TypeEnt::from_any(other) {
+                        typ
+                    } else {
+                        *self
+                    }
+                } else {
+                    *self
+                }
+            }
             _ => *self,
         }
     }

vhdl_lang/src/analysis/tests/protected_type.rs

@@ -290,3 +290,45 @@ end package;",
         Some(&code.s("prot_t", 2).pos())
     );
 }
+
+/// This was a bug where a procedure declared between the protected type and the body
+/// did not have the same signature as the definition which was after the body
+#[test]
+fn protected_type_and_body_result_in_the_same_signature() {
+    let mut builder = LibraryBuilder::new();
+    let code = builder.code(
+        "libname",
+        "
+package pkg is
+end package;
+
+package body pkg is
+  type prot_t is protected
+  end protected;
+
+  procedure myproc(arg : prot_t);
+
+  type prot_t is protected body
+  end protected body;
+
+  procedure myproc(arg : prot_t) is
+  begin
+  end procedure;
+
+end package body;
+",
+    );
+
+    let (root, diagnostics) = builder.get_analyzed_root();
+    check_no_diagnostics(&diagnostics);
+
+    assert_eq!(
+        root.find_all_references_pos(&code.s1("prot_t").pos()).len(),
+        4
+    );
+
+    assert_eq!(
+        root.find_all_references_pos(&code.s1("myproc").pos()).len(),
+        2
+    );
+}