Go back to modules.Keys

Author: pape77

src/coverlet.core/CoverageResult.cs

@@ -45,53 +45,52 @@ internal void Merge(Modules modules)
         {
             foreach (var module in modules)
             {
-                var moduleKey = Path.GetFileName(module.Key ?? throw new InvalidOperationException());
-                if (!this.Modules.Keys.Select(Path.GetFileName).Contains(moduleKey))
+                if (!this.Modules.Keys.Select(Path.GetFileName).Contains(module.Key))
                 {
-                    this.Modules.Add(moduleKey, module.Value);
+                    this.Modules.Add(module.Key, module.Value);
                 }
                 else
                 {
                     foreach (var document in module.Value)
                     {
 
-                        if (!this.Modules[moduleKey].ContainsKey(document.Key))
+                        if (!this.Modules[module.Key].ContainsKey(document.Key))
                         {
-                            this.Modules[moduleKey].Add(document.Key, document.Value);
+                            this.Modules[module.Key].Add(document.Key, document.Value);
                         }
                         else
                         {
                             foreach (var @class in document.Value)
                             {
-                                if (!this.Modules[moduleKey][document.Key].ContainsKey(@class.Key))
+                                if (!this.Modules[module.Key][document.Key].ContainsKey(@class.Key))
                                 {
-                                    this.Modules[moduleKey][document.Key].Add(@class.Key, @class.Value);
+                                    this.Modules[module.Key][document.Key].Add(@class.Key, @class.Value);
                                 }
                                 else
                                 {
                                     foreach (var method in @class.Value)
                                     {
-                                        if (!this.Modules[moduleKey][document.Key][@class.Key].ContainsKey(method.Key))
+                                        if (!this.Modules[module.Key][document.Key][@class.Key].ContainsKey(method.Key))
                                         {
-                                            this.Modules[moduleKey][document.Key][@class.Key].Add(method.Key, method.Value);
+                                            this.Modules[module.Key][document.Key][@class.Key].Add(method.Key, method.Value);
                                         }
                                         else
                                         {
                                             foreach (var line in method.Value.Lines)
                                             {
-                                                if (!this.Modules[moduleKey][document.Key][@class.Key][method.Key].Lines.ContainsKey(line.Key))
+                                                if (!this.Modules[module.Key][document.Key][@class.Key][method.Key].Lines.ContainsKey(line.Key))
                                                 {
-                                                    this.Modules[moduleKey][document.Key][@class.Key][method.Key].Lines.Add(line.Key, line.Value);
+                                                    this.Modules[module.Key][document.Key][@class.Key][method.Key].Lines.Add(line.Key, line.Value);
                                                 }
                                                 else
                                                 {
-                                                    this.Modules[moduleKey][document.Key][@class.Key][method.Key].Lines[line.Key] += line.Value;
+                                                    this.Modules[module.Key][document.Key][@class.Key][method.Key].Lines[line.Key] += line.Value;
                                                 }
                                             }
 
                                             foreach (var branch in method.Value.Branches)
                                             {
-                                                var branches = this.Modules[moduleKey][document.Key][@class.Key][method.Key].Branches;
+                                                var branches = this.Modules[module.Key][document.Key][@class.Key][method.Key].Branches;
                                                 var branchInfo = branches.FirstOrDefault(b => b.EndOffset == branch.EndOffset && b.Line == branch.Line && b.Offset == branch.Offset && b.Ordinal == branch.Ordinal && b.Path == branch.Path);
                                                 if (branchInfo == null)
                                                     branches.Add(branch);