Add file subtype

Author: kraigher

vhdl_lang/src/analysis/declarative.rs

@@ -318,8 +318,8 @@ impl<'a> AnalyzeContext<'a> {
                     self.analyze_expression(region, expr, diagnostics)?;
                 }
 
-                if subtype.is_some() {
-                    region.add(ident.clone(), NamedEntityKind::File, diagnostics);
+                if let Some(subtype) = subtype {
+                    region.add(ident.clone(), NamedEntityKind::File(subtype), diagnostics);
                 }
             }
             Declaration::Component(ref mut component) => {

vhdl_lang/src/analysis/named_entity.rs

@@ -91,7 +91,7 @@ pub enum NamedEntityKind {
         base_object: ObjectEnt,
         type_mark: TypeEnt,
     },
-    File,
+    File(Subtype),
     InterfaceFile(TypeEnt),
     Component(Region<'static>),
     Attribute,
@@ -154,7 +154,7 @@ impl NamedEntityKind {
             NonObjectAlias(..) => "alias",
             ObjectAlias { .. } => "object alias",
             ExternalAlias { .. } => "external alias",
-            File => "file",
+            File(..) => "file",
             InterfaceFile(..) => "file",
             ElementDeclaration(..) => "element declaration",
             Component(..) => "component",

vhdl_lang/src/analysis/semantic.rs

@@ -1397,7 +1397,8 @@ impl NamedEntity {
             NamedEntityKind::DeferredConstant(ref subtype) => subtype.base_type(),
             NamedEntityKind::ElementDeclaration(ref subtype) => subtype.base_type(),
             NamedEntityKind::PhysicalLiteral(ref base_type) => base_type,
-
+            NamedEntityKind::InterfaceFile(ref file) => file.base_type(),
+            NamedEntityKind::File(ref file) => file.base_type(),
             // Ignore now to avoid false positives
             NamedEntityKind::LoopParameter => return true,
             _ => {