#629 Visual Studio Coverage: Added support for partial line coverage

danielpalme · Oct 15, 2023 · 8278973 · 8278973
1 parent 0e10248
commit 8278973
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 11 deletions.
diff --git a/src/ReportGenerator.Core/Parser/Analysis/FlagsLineVisitStatus.cs b/src/ReportGenerator.Core/Parser/Analysis/FlagsLineVisitStatus.cs
@@ -0,0 +1,31 @@
+using System;
+
+namespace Palmmedia.ReportGenerator.Core.Parser.Analysis
+{
+    /// <summary>
+    /// Indicates the coverage status of a line in a source file.
+    /// </summary>
+    [Flags]
+    internal enum FlagsLineVisitStatus
+    {
+        /// <summary>
+        /// Line can not be covered.
+        /// </summary>
+        NotCoverable = 0,
+
+        /// <summary>
+        /// Line was not covered.
+        /// </summary>
+        NotCovered = 1,
+
+        /// <summary>
+        /// Line was partially covered.
+        /// </summary>
+        PartiallyCovered = 2,
+
+        /// <summary>
+        /// Line was covered.
+        /// </summary>
+        Covered = 4
+    }
+}
diff --git a/src/ReportGenerator.Core/Parser/VisualStudioParser.cs b/src/ReportGenerator.Core/Parser/VisualStudioParser.cs
@@ -16,7 +16,7 @@ namespace Palmmedia.ReportGenerator.Core.Parser
     /// <summary>
     /// Parser for XML reports generated by Visual Studio.
     /// </summary>
-    internal class VisualStudioParser : ParserBase
+    internal partial class VisualStudioParser : ParserBase
     {
         /// <summary>
         /// The Logger.
@@ -203,11 +203,13 @@ private static CodeFile ProcessFile(XElement[] modules, string fileId, Class @cl
 
             int[] coverage = new int[] { };
             LineVisitStatus[] lineVisitStatus = new LineVisitStatus[] { };
+            FlagsLineVisitStatus[] flagsLineVisitStatus = new FlagsLineVisitStatus[] { };
 
             if (linesOfFile.Length > 0)
             {
                 coverage = new int[linesOfFile[linesOfFile.LongLength - 1].LineNumberEnd + 1];
                 lineVisitStatus = new LineVisitStatus[linesOfFile[linesOfFile.LongLength - 1].LineNumberEnd + 1];
+                flagsLineVisitStatus = new FlagsLineVisitStatus[linesOfFile[linesOfFile.LongLength - 1].LineNumberEnd + 1];
 
                 for (int i = 0; i < coverage.Length; i++)
                 {
@@ -223,25 +225,36 @@ private static CodeFile ProcessFile(XElement[] modules, string fileId, Class @cl
 
                         if (seqpnt.Coverage == 2)
                         {
-                            if (lineVisitStatus[lineNumber] == LineVisitStatus.NotCoverable)
-                            {
-                                lineVisitStatus[lineNumber] = LineVisitStatus.NotCovered;
-                            }
+                            flagsLineVisitStatus[lineNumber] |= FlagsLineVisitStatus.NotCovered;
                         }
                         else if (seqpnt.Coverage == 1)
                         {
-                            if (lineVisitStatus[lineNumber] == LineVisitStatus.NotCoverable
-                                || lineVisitStatus[lineNumber] == LineVisitStatus.NotCovered)
-                            {
-                                lineVisitStatus[lineNumber] = LineVisitStatus.PartiallyCovered;
-                            }
+                            flagsLineVisitStatus[lineNumber] |= FlagsLineVisitStatus.PartiallyCovered;
                         }
                         else if (seqpnt.Coverage == 0)
                         {
-                            lineVisitStatus[lineNumber] = LineVisitStatus.Covered;
+                            flagsLineVisitStatus[lineNumber] |= FlagsLineVisitStatus.Covered;
                         }
                     }
                 }
+
+                for (int i = 0; i < coverage.Length; i++)
+                {
+                    if ((int)flagsLineVisitStatus[i] == (int)FlagsLineVisitStatus.Covered)
+                    {
+                        lineVisitStatus[i] = LineVisitStatus.Covered;
+                    }
+                    else if ((int)flagsLineVisitStatus[i] == (int)FlagsLineVisitStatus.NotCovered)
+                    {
+                        lineVisitStatus[i] = LineVisitStatus.NotCovered;
+                    }
+                    else if (flagsLineVisitStatus[i].HasFlag(FlagsLineVisitStatus.PartiallyCovered)
+                        || (flagsLineVisitStatus[i].HasFlag(FlagsLineVisitStatus.Covered)
+                            && flagsLineVisitStatus[i].HasFlag(FlagsLineVisitStatus.NotCovered)))
+                    {
+                        lineVisitStatus[i] = LineVisitStatus.PartiallyCovered;
+                    }
+                }
             }
 
             var codeFile = new CodeFile(filePath, coverage, lineVisitStatus);