Merge pull request lucaslorentz#32 from bhugot/patch-1

Change GetSourceRelativePath
ido-namely · Feb 26, 2018 · 9f70f74 · 9f70f74
2 parents 2f7fbd4 + 990f3ea
commit 9f70f74
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/src/MiniCover/Instrumentation/Instrumenter.cs b/src/MiniCover/Instrumentation/Instrumenter.cs
@@ -333,15 +333,17 @@ private void InstrumentInstruction(int instructionId, Instruction instruction,
 
         private string GetSourceRelativePath(string path)
         {
-            if (!path.StartsWith(normalizedWorkDir))
-                return null;
-
-            if (!sourceFiles.Contains(path))
-                return null;
-
-            return path.Substring(normalizedWorkDir.Length);
+            Uri file = new Uri(path);
+            Uri folder = new Uri(normalizedWorkDir);
+            string relativePath = 
+                Uri.UnescapeDataString(
+                    folder.MakeRelativeUri(file)
+                        .ToString()
+                        .Replace('/', Path.DirectorySeparatorChar)
+                );
+            return  relativePath;
         }
-
+        
         private string GetPdbFile(string assemblyFile)
         {
             return Path.ChangeExtension(assemblyFile, "pdb");