Merge pull request lucaslorentz#25 from lucaslorentz/fix-duplicated-s…

…ource-file-handling

Fix errors when multiple assemblies points to same source file

src/MiniCover/Model/InstrumentationResult.cs

@@ -26,5 +26,13 @@ public void AddExtraAssembly(string file)
         {
             ExtraAssemblies.Add(file);
         }
+
+        public SortedDictionary<string, SourceFile> GetSourceFiles()
+        {
+            return new SortedDictionary<string, SourceFile>(Assemblies
+                .SelectMany(a => a.SourceFiles)
+                .GroupBy(kv => kv.Key, kv => kv.Value)
+                .ToDictionary(g => g.Key, g => SourceFile.Merge(g)));
+        }
     }
 }

src/MiniCover/Model/SourceFile.cs

@@ -1,9 +1,18 @@
 using System.Collections.Generic;
+using System.Linq;
 
 namespace MiniCover.Model
 {
     public class SourceFile
     {
+        public static SourceFile Merge(IEnumerable<SourceFile> sources)
+        {
+            return new SourceFile
+            {
+                Instructions = sources.SelectMany(s => s.Instructions).ToList()
+            };
+        }
+
         public List<InstrumentedInstruction> Instructions = new List<InstrumentedInstruction>();
     }
 }

src/MiniCover/Reports/BaseReport.cs

@@ -11,15 +11,10 @@ public abstract class BaseReport
         public virtual int Execute(InstrumentationResult result, float threshold)
         {
             var hits = File.Exists(result.HitsFile)
-                               ? File.ReadAllLines(result.HitsFile).Select(h => int.Parse(h)).ToHashSet()
-                               : new HashSet<int>();
-
-            var files = result.Assemblies
-                .SelectMany(assembly => assembly.SourceFiles)
-                .ToDictionary(
-                    x => x.Key,
-                    x => x.Value
-                );
+                ? File.ReadAllLines(result.HitsFile).Select(h => int.Parse(h)).ToHashSet()
+                : new HashSet<int>();
+
+            var files = result.GetSourceFiles();
 
             SetFileColumnLength(files.Keys.Select(s => s.Length).Concat(new[] { 10 }).Max());