Improved lcov support (take FNDA elements into account to determine whether a code element has been covered)

Author: danielpalme

src/Readme.txt

@@ -71,6 +71,7 @@ CHANGELOG
 
     * New: #741 Charts does not render "Full method coverage" elements if coverage information is not available
     * New: Added new setting "applyMaximumGroupingLevel". This allows to apply the maximum grouping level instead of the default 'By assembly' grouping in HTML reports.
+    * New: Improved lcov support (take FNDA elements into account to determine whether a code element has been covered)
 
 5.4.7.0
 

src/ReportGenerator.Core/Parser/Analysis/CodeFile.cs

@@ -251,9 +251,7 @@ public int CoveredCodeElements
             get
             {
                 return this.CodeElements.Count(
-                    x => this.lineCoverage.Skip(x.FirstLine)
-                        .Take(x.LastLine - x.FirstLine + 1)
-                        .Any(y => y > 0));
+                    x => x.CoverageQuota.GetValueOrDefault() > 0);
             }
         }
 

src/ReportGenerator.Core/Parser/CodeElementBase.cs

@@ -26,6 +26,11 @@ public CodeElementBase(string name, int firstLine)
         /// </summary>
         public int FirstLine { get; }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether the method has not been executed.
+        /// </summary>
+        public bool NotExecuted { get; set; }
+
         /// <summary>
         /// Returns a <see cref="string"/> that represents this instance.
         /// </summary>

src/ReportGenerator.Core/Parser/LCovParser.cs

@@ -125,6 +125,8 @@ private void ProcessClass(Class @class, string fileName, string[] lines, ref int
 
             var branchesByLineNumber = new Dictionary<int, ICollection<Branch>>();
 
+            int fndaCounter = -1;
+
             while (true)
             {
                 string line = lines[currentLine];
@@ -175,6 +177,19 @@ private void ProcessClass(Class @class, string fileName, string[] lines, ref int
                         branchesByLineNumber.Add(lineNumber, branches);
                     }
                 }
+                else if (line.StartsWith("FNDA:"))
+                {
+                    fndaCounter++;
+
+                    line = line.Substring(5);
+                    string[] tokens = line.Split(',');
+                    int executionCount = int.Parse(tokens[0], CultureInfo.InvariantCulture);
+
+                    if (executionCount == 0)
+                    {
+                        codeElements[fndaCounter].NotExecuted = true;
+                    }
+                }
                 else if (line.StartsWith("DA:"))
                 {
                     line = line.Substring(3);
@@ -234,12 +249,16 @@ private void ProcessClass(Class @class, string fileName, string[] lines, ref int
                     lastLine = codeElements[i + 1].FirstLine - 1;
                 }
 
+                decimal? coverageOfCodeElement = codeElement.NotExecuted
+                    ? 0
+                    : codeFile.CoverageQuotaInRange(codeElement.FirstLine, lastLine);
+
                 codeFile.AddCodeElement(new CodeElement(
                     codeElement.Name,
                     CodeElementType.Method,
                     codeElement.FirstLine,
                     lastLine,
-                    codeFile.CoverageQuotaInRange(codeElement.FirstLine, lastLine)));
+                    coverageOfCodeElement));
             }
 
             @class.AddFile(codeFile);