#536: Improved support for C code in Visual Studio coverage input for…

…mat (*.coveragexml)

src/Readme.txt

@@ -68,6 +68,7 @@ CHANGELOG
 
 5.1.17.0
 
+    * Fix: #536: Improved support for C code in Visual Studio coverage input format (*.coveragexml)
     * Fix: #582: Removed method coverage usage for line coverage if no coverage is available
 
 5.1.16.0

src/ReportGenerator.Core/Parser/DynamicCodeCoverageParser.cs

@@ -93,14 +93,19 @@ private Assembly ProcessAssembly(XElement module)
                 .Select(f => new ClassWithNamespace()
                 {
                     Namespace = f.Attribute("namespace")?.Value,
-                    ClassName = f.Attribute("type_name").Value
+                    ClassName = f.Attribute("type_name").Value,
+                    TypeNameWasMissing = f.Attribute("type_name_missing") != null
                 })
                 .Where(c => !c.ClassName.Contains("<>")
                     && !c.ClassName.StartsWith("$", StringComparison.OrdinalIgnoreCase))
                 .Select(c =>
                 {
-                    int nestedClassSeparatorIndex = c.ClassName.IndexOf('.');
-                    c.ClassName = nestedClassSeparatorIndex > -1 ? c.ClassName.Substring(0, nestedClassSeparatorIndex) : c.ClassName;
+                    if (!c.TypeNameWasMissing)
+                    {
+                        int nestedClassSeparatorIndex = c.ClassName.IndexOf('.');
+                        c.ClassName = nestedClassSeparatorIndex > -1 ? c.ClassName.Substring(0, nestedClassSeparatorIndex) : c.ClassName;
+                    }
+
                     return c;
                 })
                 .Distinct()
@@ -353,6 +358,8 @@ private class ClassWithNamespace
 
             public string ClassName { get; set; }
 
+            public bool TypeNameWasMissing { get; set; }
+
             public string FullName => this.Namespace == null ? this.ClassName : $"{this.Namespace}.{this.ClassName}";
 
             public override bool Equals(object obj)

src/ReportGenerator.Core/Parser/Preprocessing/DynamicCodeCoverageReportPreprocessor.cs

@@ -149,6 +149,7 @@ private static void AddMissingTypeNames(XElement module)
                     if (firstSourceId != null && classNamesBySoureFileId.TryGetValue(firstSourceId, out string className))
                     {
                         function.Attribute("type_name").Value = className;
+                        function.Add(new XAttribute("type_name_missing", "true"));
                     }
                 }
             }