#363: Fixed clover file handling (several branches per line)

Author: danielpalme

src/Readme.txt

@@ -63,6 +63,10 @@ For further details take a look at LICENSE.txt.
 
 CHANGELOG
 
+4.6.2.0
+
+    * Fix: #363: Fixed clover file handling (several branches per line)
+
 4.6.1.0
 
     * Fix: #351: Fixed reading large XML coverage files

src/ReportGenerator.Core/Parser/CloverParser.cs

@@ -187,24 +187,36 @@ private static Dictionary<int, ICollection<Branch>> GetBranches(IEnumerable<XEle
                 int negativeBrancheCovered = int.Parse(line.Attribute("falsecount").Value, CultureInfo.InvariantCulture);
                 int positiveBrancheCovered = int.Parse(line.Attribute("truecount").Value, CultureInfo.InvariantCulture);
 
-                var branches = new HashSet<Branch>();
+                if (result.ContainsKey(lineNumber))
+                {
+                    var branches = result[lineNumber];
+
+                    Branch negativeBranch = branches.First();
+                    Branch positiveBranch = branches.ElementAt(1);
 
-                string identifier1 = string.Format(
+                    negativeBranch.BranchVisits = Math.Max(negativeBrancheCovered > 0 ? 1 : 0, negativeBranch.BranchVisits);
+                    positiveBranch.BranchVisits = Math.Max(positiveBrancheCovered > 0 ? 1 : 0, positiveBranch.BranchVisits);
+                }
+                else
+                {
+                    string identifier1 = string.Format(
                         CultureInfo.InvariantCulture,
                         "{0}_{1}",
                         lineNumber,
                         "0");
 
-                string identifier2 = string.Format(
-                        CultureInfo.InvariantCulture,
-                        "{0}_{1}",
-                        lineNumber,
-                        "1");
+                    string identifier2 = string.Format(
+                            CultureInfo.InvariantCulture,
+                            "{0}_{1}",
+                            lineNumber,
+                            "1");
 
-                branches.Add(new Branch(negativeBrancheCovered > 0 ? 1 : 0, identifier1));
-                branches.Add(new Branch(positiveBrancheCovered > 0 ? 1 : 0, identifier2));
+                    var branches = new HashSet<Branch>();
+                    branches.Add(new Branch(negativeBrancheCovered > 0 ? 1 : 0, identifier1));
+                    branches.Add(new Branch(positiveBrancheCovered > 0 ? 1 : 0, identifier2));
 
-                result.Add(lineNumber, branches);
+                    result.Add(lineNumber, branches);
+                }
             }
 
             return result;