Merge pull request #667 from fdorg/fix/relative-path

Project GetRelativePath improvement

Author: Meychi

External/Plugins/ProjectManager/Projects/ProjectPaths.cs

@@ -13,8 +13,20 @@ public static string GetRelativePath(string baseDirectory, string path)
                 throw new ArgumentException("The path is already relative.");
 
             char slash = Path.DirectorySeparatorChar;
-            string[] a = baseDirectory.Trim(slash).Split(slash);
-            string[] b = path.Trim(slash).Split(slash);
+            path = path.TrimEnd(slash);
+            baseDirectory = baseDirectory.TrimEnd(slash);
+
+            // trivial cases
+            if (path == baseDirectory) 
+                return "";
+            if (path[1] == ':' && path[0] != baseDirectory[0]) // drive
+                return path; 
+            if (path.Length > baseDirectory.Length && path.StartsWith(baseDirectory + slash))
+                return path.Substring(baseDirectory.Length + 1);
+
+            // resolve relative path
+            string[] a = baseDirectory.Split(slash);
+            string[] b = path.Split(slash);
 
             ArrayList relPath = new ArrayList();
             int i = 0;
@@ -26,6 +38,10 @@ public static string GetRelativePath(string baseDirectory, string path)
                     break;
             }
 
+            // only common drive letter, consider not relative
+            if (i <= 1)
+                return path; 
+
             // at this point, i is the index of the first diverging element of the two paths
             int backtracks = a.Length - i;
             for (int j = 0; j < backtracks; j++)