Updated targeted C# models to include a ModelSourceFile property. This will contain the fully qualified path of the file that was used to load the source code model.

Author: sgiffinlcd

src/CodeFactoryVisualStudio/CodeFactory.DotNet/CSharp/CsAttribute.cs

@@ -32,6 +32,7 @@ public abstract class CsAttribute:CsModel,ICsAttribute
         /// <param name="hasErrors">Flag that determine if errors were found creating the model.</param>
         /// <param name="loadedFromSource">Flag that determines if the model was loaded from source code or from an existing library.</param>
         /// <param name="language">The target language the model was generated from.</param>
+        /// <param name="modelSourceFile">The soure code file for the model.</param>
         /// <param name="type">The target type of the attribute.</param>
         /// <param name="sourceDocument">The source document that was used to build this model. This is optional parameter and can be null.</param>
         /// <param name="modelStore">Optional the lookup storage for models created during the compile or lookup of the model.</param>
@@ -40,11 +41,12 @@ public abstract class CsAttribute:CsModel,ICsAttribute
         /// <param name="hasParameters">Flag that determines if the attribute has parameters.</param>
         /// <param name="parentPath">The fully qualified lookup path to the parent model for this attribute.</param>
         /// <param name="parameters">The list of parameters assigned to the attribute.</param>
-        protected CsAttribute(bool isLoaded, bool hasErrors, bool loadedFromSource, SourceCodeType language,
+        protected CsAttribute(bool isLoaded, bool hasErrors, bool loadedFromSource, SourceCodeType language, string modelSourceFile,
             IReadOnlyList<string> sourceFiles, bool hasParameters, string parentPath, IReadOnlyList<CsAttributeParameter> parameters, 
             CsType type, string sourceDocument = null, ModelStore<ICsModel> modelStore = null, IReadOnlyList<ModelLoadException> modelErrors = null)
             : base(isLoaded, hasErrors, loadedFromSource, language, CsModelType.Attribute, sourceDocument, modelStore, modelErrors)
         {
+            _modelSourceFile = modelSourceFile;
             _sourceFiles = sourceFiles ?? ImmutableList<string>.Empty;
             _hasParameters = hasParameters;
             _parentPath = parentPath;
@@ -179,5 +181,12 @@ protected CsAttribute(bool isLoaded, bool hasErrors, bool loadedFromSource, Sour
         /// </summary>
         public CsModel Parent => GetModel(_parentPath);
 
+        /// <summary>
+        /// Backing field for <see cref="ModelSourceFile"/>
+        /// </summary>
+        private readonly string _modelSourceFile;
+
+        /// <inheritdoc/>
+        public string ModelSourceFile => _modelSourceFile;
     }
 }

src/CodeFactoryVisualStudio/CodeFactory.DotNet/CSharp/CsClass.cs

@@ -39,6 +39,7 @@ public abstract class CsClass:CsContainer,ICsClass
         /// <param name="hasStrongTypesInGenerics">Flag that determines if the generics use strong type definitions.</param>
         /// <param name="genericParameters">Generic parameters assigned to the container.</param>
         /// <param name="genericTypes">Target types for the generic parameters assigned to the container.</param>
+        /// <param name="modelSourceFile">The source code file the model was generated from.</param>
         /// <param name="sourceFiles">List of the fully qualified paths to the source code files this model is defined in.</param>
         /// <param name="hasDocumentation">Flag that determines if the model has XML documentation assigned to it.</param>
         /// <param name="documentation">The xml documentation assigned to the model.</param>
@@ -53,13 +54,13 @@ public abstract class CsClass:CsContainer,ICsClass
         /// <param name="isSealed">Flag that determines if the model is sealed.</param>
         protected CsClass(bool isLoaded, bool hasErrors, bool loadedFromSource, SourceCodeType language,
             IReadOnlyList<CsAttribute> attributes, bool isGeneric, bool hasStrongTypesInGenerics,
-            IReadOnlyList<CsGenericParameter> genericParameters, IReadOnlyList<CsType> genericTypes, IReadOnlyList<string> sourceFiles,
+            IReadOnlyList<CsGenericParameter> genericParameters, IReadOnlyList<CsType> genericTypes, string modelSourceFile, IReadOnlyList<string> sourceFiles,
             bool hasDocumentation, string documentation, string lookupPath, string name, string ns, string parentPath, 
             CsSecurity security, IReadOnlyList<CsInterface> inheritedInterfaces, IReadOnlyList<CsMember> members,
             bool isStatic, bool isAbstract, bool isSealed, CsClass baseClass, string sourceDocument = null, 
             ModelStore<ICsModel> modelStore = null, IReadOnlyList<ModelLoadException> modelErrors = null)
             : base(isLoaded, hasErrors, loadedFromSource, language, CsModelType.Class, attributes, 
-                isGeneric, hasStrongTypesInGenerics, genericParameters, genericTypes, sourceFiles, hasDocumentation,
+                isGeneric, hasStrongTypesInGenerics, genericParameters, genericTypes, modelSourceFile, sourceFiles, hasDocumentation,
                 documentation, lookupPath, name, ns, parentPath, CsContainerType.Class, security, inheritedInterfaces, 
                 members, sourceDocument, modelStore, modelErrors)
         {

src/CodeFactoryVisualStudio/CodeFactory.DotNet/CSharp/CsContainer.cs

@@ -54,6 +54,7 @@ public abstract class CsContainer:CsModel,ICsContainer
         /// <param name="hasStrongTypesInGenerics">Flag that determines if the generics use strong type definitions.</param>
         /// <param name="genericParameters">Generic parameters assigned to the container.</param>
         /// <param name="genericTypes">Target types for the generic parameters assigned to the container.</param>
+        /// <param name="modelSourceFile">The source file the model was loaded from.</param>
         /// <param name="sourceFiles">List of the fully qualified paths to the source code files this model is defined in.</param>
         /// <param name="hasDocumentation">Flag that determines if the model has XML documentation assigned to it.</param>
         /// <param name="documentation">The xml documentation assigned to the model.</param>
@@ -66,7 +67,7 @@ public abstract class CsContainer:CsModel,ICsContainer
         /// <param name="inheritedInterfaces">The interfaces that are inherited by this container.</param>
         protected CsContainer(bool isLoaded, bool hasErrors, bool loadedFromSource, SourceCodeType language, CsModelType modelType,
             IReadOnlyList<CsAttribute> attributes, bool isGeneric, bool hasStrongTypesInGenerics, 
-            IReadOnlyList<CsGenericParameter> genericParameters, IReadOnlyList<CsType> genericTypes, 
+            IReadOnlyList<CsGenericParameter> genericParameters, IReadOnlyList<CsType> genericTypes, string modelSourceFile,
             IReadOnlyList<string> sourceFiles, bool hasDocumentation, string documentation, string lookupPath,
             string name, string ns, string parentPath, CsContainerType containerType, CsSecurity security,
             IReadOnlyList<CsInterface> inheritedInterfaces, IReadOnlyList<CsMember> members,
@@ -78,6 +79,7 @@ protected CsContainer(bool isLoaded, bool hasErrors, bool loadedFromSource, Sour
             _hasStrongTypesInGenerics = hasStrongTypesInGenerics;
             _genericParameters = genericParameters ?? ImmutableList<CsGenericParameter>.Empty;
             _genericTypes = genericTypes ?? ImmutableList<CsType>.Empty;
+            _modelSourceFile = modelSourceFile;
             _sourceFiles = sourceFiles ?? ImmutableList<string>.Empty;
             _hasDocumentation = hasDocumentation;
             _documentation = documentation;
@@ -393,5 +395,13 @@ protected CsContainer(bool isLoaded, bool hasErrors, bool loadedFromSource, Sour
         /// The parent to the current model. This will return null if there is no parent for this model, or the parent could not be located. 
         /// </summary>
         public CsModel Parent => GetModel(_parentPath);
+
+        /// <summary>
+        /// Backing field for <see cref="ModelSourceFile"/>
+        /// </summary>
+        private readonly string _modelSourceFile;
+
+        /// <inheritdoc/>
+        public string ModelSourceFile => _modelSourceFile;
     }
 }

src/CodeFactoryVisualStudio/CodeFactory.DotNet/CSharp/CsDelegate.cs

@@ -55,6 +55,7 @@ public abstract class CsDelegate:CsModel,ICsDelegate
         /// <param name="hasDocumentation">Flag that determines if the model has XML documentation assigned to it.</param>
         /// <param name="documentation">The xml documentation assigned to the model.</param>
         /// <param name="lookupPath">The fully qualified model lookup path for this model.</param>
+        /// <param name="modelSourceFile">The source code file the model was created from.</param>
         /// <param name="sourceFiles">List of the fully qualified paths to the source code files this member is defined in.</param>
         /// <param name="name">The name of the model.</param>
         /// <param name="ns">The namespace this delegate is assigned to.</param>
@@ -72,7 +73,7 @@ public abstract class CsDelegate:CsModel,ICsDelegate
         /// <param name="modelErrors">Optional the error that occured while creating the model.</param>
         protected CsDelegate(bool isLoaded, bool hasErrors, bool loadedFromSource, SourceCodeType language,
             IReadOnlyList<CsAttribute> attributes, bool isGeneric, bool hasStrongTypesInGenerics, IReadOnlyList<CsGenericParameter> genericParameters, 
-            IReadOnlyList<CsType> genericTypes, bool hasDocumentation, string documentation, string lookupPath,
+            IReadOnlyList<CsType> genericTypes, bool hasDocumentation, string documentation, string lookupPath, string modelSourceFile,
             IReadOnlyList<string> sourceFiles, string name, string ns, bool hasParameters, bool isVoid, string parentPath,
             CsSecurity security, CsType returnType, IReadOnlyList<CsParameter> parameters, CsMethod invokeMethod,
             CsMethod beginInvokeMethod, CsMethod endInvokeMethod, string sourceDocument = null, ModelStore<ICsModel> modelStore = null, IReadOnlyList<ModelLoadException> modelErrors = null)
@@ -86,6 +87,7 @@ protected CsDelegate(bool isLoaded, bool hasErrors, bool loadedFromSource, Sourc
             _hasDocumentation = hasDocumentation;
             _documentation = documentation;
             _lookupPath = lookupPath;
+            _modelSourceFile = modelSourceFile;
             _sourceFiles = sourceFiles ?? ImmutableList<string>.Empty;
             _name = name;
             _ns = ns;
@@ -348,6 +350,14 @@ protected CsDelegate(bool isLoaded, bool hasErrors, bool loadedFromSource, Sourc
         /// <summary>
         /// The parent to the current model. This will return null if there is no parent for this model, or the parent could not be located. 
         /// </summary>
-        public CsModel Parent => LookupModel(_parentPath);
+        public CsModel Parent => GetModel(_parentPath);
+
+        /// <summary>
+        /// Backing field for <see cref="ModelSourceFile"/>
+        /// </summary>
+        private readonly string _modelSourceFile;
+
+        /// <inheritdoc/>
+        public string ModelSourceFile => _modelSourceFile;
     }
 }

src/CodeFactoryVisualStudio/CodeFactory.DotNet/CSharp/CsEnum.cs

@@ -47,11 +47,13 @@ public abstract class CsEnum:CsModel,ICsEnum
         /// <param name="hasDocumentation">Flag that determines if the model has XML documentation assigned to it.</param>
         /// <param name="documentation">The xml documentation assigned to the model.</param>
         /// <param name="lookupPath">The fully qualified model lookup path for this model.</param>
+        /// <param name="modelSourceFile">The source code file the model was generated from.</param>
         /// <param name="name">The name of the model.</param>
+        /// <param name="ns"></param>
         /// <param name="parentPath">The fully qualified lookup path for the parent model to this one.</param>
         /// <param name="security">The security scope assigned to this model.</param>
         protected CsEnum(bool isLoaded, bool hasErrors, bool loadedFromSource, SourceCodeType language,
-            IReadOnlyList<CsAttribute> attributes, string parentPath, bool hasDocumentation, string documentation, string lookupPath,
+            IReadOnlyList<CsAttribute> attributes, string parentPath, bool hasDocumentation, string documentation, string lookupPath,string modelSourceFile,
             IReadOnlyList<string> sourceFiles, string name, string ns, CsSecurity security, IReadOnlyList<CsEnumValue> values, 
             string sourceDocument = null, ModelStore<ICsModel> modelStore = null, IReadOnlyList<ModelLoadException> modelErrors = null): base(isLoaded, hasErrors, loadedFromSource, language, CsModelType.Enum, sourceDocument, modelStore, modelErrors)
         {
@@ -60,6 +62,7 @@ protected CsEnum(bool isLoaded, bool hasErrors, bool loadedFromSource, SourceCod
             _hasDocumentation = hasDocumentation;
             _documentation = documentation;
             _lookupPath = lookupPath;
+            _modelSourceFile = modelSourceFile;
             _sourceFiles = sourceFiles ?? ImmutableList<string>.Empty;
             _name = name;
             _ns = ns;
@@ -90,7 +93,7 @@ protected CsEnum(bool isLoaded, bool hasErrors, bool loadedFromSource, SourceCod
         /// <summary>
         /// The parent to the current model. This will return null if there is no parent for this model, or the parent could not be located. 
         /// </summary>
-        public CsModel Parent => LookupModel(_parentPath);
+        public CsModel Parent => GetModel(_parentPath);
 
         /// <summary>
         ///     Flag that determines if the model has code level documentation assigned to it.
@@ -231,5 +234,13 @@ protected CsEnum(bool isLoaded, bool hasErrors, bool loadedFromSource, SourceCod
         ///     List of the enumeration values implemented in this enumeration.
         /// </summary>
         IReadOnlyList<IDotNetEnumValue> IDotNetEnum.Values => Values;
+
+        /// <summary>
+        /// Backing field for <see cref="ModelSourceFile"/>
+        /// </summary>
+        private readonly string _modelSourceFile;
+
+        /// <inheritdoc/>
+        public string ModelSourceFile => _modelSourceFile;
     }
 }

src/CodeFactoryVisualStudio/CodeFactory.DotNet/CSharp/CsEnumValue.cs

@@ -45,12 +45,13 @@ public abstract class CsEnumValue:CsModel,ICsEnumValue
         /// <param name="hasDocumentation">Flag that determines if the model has XML documentation assigned to it.</param>
         /// <param name="documentation">The xml documentation assigned to the model.</param>
         /// <param name="lookupPath">The fully qualified model lookup path for this model.</param>
+        /// <param name="modelSourceFile">The source code file the model was generated from.</param>
         /// <param name="name">The name of the model.</param>
         /// <param name="parentPath">The fully qualified lookup path for the parent model to this one.</param>
         /// <param name="value">The value assigned to the enumeration value.</param>
         /// <param name="security">The security scope assigned to this model.</param>
         protected CsEnumValue(bool isLoaded, bool hasErrors, bool loadedFromSource, SourceCodeType language,
-            IReadOnlyList<CsAttribute> attributes, string parentPath, bool hasDocumentation, string documentation, string lookupPath,
+            IReadOnlyList<CsAttribute> attributes, string parentPath, bool hasDocumentation, string documentation, string lookupPath, string modelSourceFile,
             IReadOnlyList<string> sourceFiles, string name,
             string value, CsSecurity security, string sourceDocument = null, ModelStore<ICsModel> modelStore = null, IReadOnlyList<ModelLoadException> modelErrors = null)
             : base(isLoaded, hasErrors, loadedFromSource, language, CsModelType.EnumValue, sourceDocument, modelStore, modelErrors)
@@ -61,6 +62,7 @@ protected CsEnumValue(bool isLoaded, bool hasErrors, bool loadedFromSource, Sour
             _hasDocumentation = hasDocumentation;
             _documentation = documentation;
             _lookupPath = lookupPath;
+            _modelSourceFile = modelSourceFile;
             _sourceFiles = sourceFiles ?? ImmutableList<string>.Empty;
             _name = name;
             _value = value;
@@ -217,5 +219,13 @@ protected CsEnumValue(bool isLoaded, bool hasErrors, bool loadedFromSource, Sour
         ///     The value that has been assigned to the enumeration value.
         /// </summary>
         public string Value => _value;
+
+        /// <summary>
+        /// Backing field for <see cref="ModelSourceFile"/>
+        /// </summary>
+        private readonly string _modelSourceFile;
+
+        /// <inheritdoc/>
+        public string ModelSourceFile => _modelSourceFile;
     }
 }

src/CodeFactoryVisualStudio/CodeFactory.DotNet/CSharp/CsEvent.cs

@@ -38,6 +38,7 @@ public abstract class CsEvent:CsMember,ICsEvent
         /// <param name="modelStore">Optional the lookup storage for models created during the compile or lookup of the model.</param>
         /// <param name="modelErrors">Optional the error that occured while creating the model.</param>
         /// <param name="attributes">List of the attributes assigned to this model.</param>
+        /// <param name="modelSourceFile">The source file the model was generated from.</param>
         /// <param name="sourceFiles">List of the fully qualified paths to the source code files this member is defined in.</param>
         /// <param name="hasDocumentation">Flag that determines if the model has XML documentation assigned to it.</param>
         /// <param name="documentation">The xml documentation assigned to the model.</param>
@@ -55,11 +56,11 @@ public abstract class CsEvent:CsMember,ICsEvent
         /// <param name="addMethod">Model for the add method for this event.</param>
         /// <param name="removeMethod">Model for the remove method for this event.</param>
         protected CsEvent(bool isLoaded, bool hasErrors, bool loadedFromSource, SourceCodeType language,
-            IReadOnlyList<CsAttribute> attributes, IReadOnlyList<string> sourceFiles, bool hasDocumentation, string documentation,
+            IReadOnlyList<CsAttribute> attributes, string modelSourceFile, IReadOnlyList<string> sourceFiles, bool hasDocumentation, string documentation,
             string lookupPath, string name, string parentPath, CsSecurity security, bool isAbstract, bool isVirtual, bool isOverride, 
             bool isSealed, bool isStatic, CsDelegate eventHandlerDelegate, CsMethod raiseMethod, CsMethod addMethod, CsMethod removeMethod,
             CsType eventType, string sourceDocument = null, ModelStore<ICsModel> modelStore = null, IReadOnlyList<ModelLoadException> modelErrors = null): base(isLoaded, hasErrors, loadedFromSource, 
-            language, CsModelType.Event, attributes, sourceFiles, hasDocumentation, documentation, 
+            language, CsModelType.Event, attributes, modelSourceFile, sourceFiles, hasDocumentation, documentation, 
             lookupPath, name, parentPath, security, CsMemberType.Event, sourceDocument, modelStore, modelErrors)
         {
             _isAbstract = isAbstract;