resource.relativePath fix for windows (for microsoft#90063)

aeschli · aeschli · commit a94e5d915c29 · 2020-02-06T17:04:56.000+01:00
diff --git a/src/vs/base/common/resources.ts b/src/vs/base/common/resources.ts
@@ -227,7 +227,7 @@ export function relativePath(from: URI, to: URI, ignoreCase = hasToIgnoreCase(fr
 		return undefined;
 	}
 	if (from.scheme === Schemas.file) {
-		const relativePath = paths.relative(from.path, to.path);
+		const relativePath = paths.relative(originalFSPath(from), originalFSPath(to));
 		return isWindows ? extpath.toSlashes(relativePath) : relativePath;
 	}
 	let fromPath = from.path || '/', toPath = to.path || '/';

Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ export function relativePath(from: URI, to: URI, ignoreCase = hasToIgnoreCase(fr`
`227`	`227`	`return undefined;`
`228`	`228`	`}`
`229`	`229`	`if (from.scheme === Schemas.file) {`
`230`		`- const relativePath = paths.relative(from.path, to.path);`
	`230`	`+ const relativePath = paths.relative(originalFSPath(from), originalFSPath(to));`
`231`	`231`	`return isWindows ? extpath.toSlashes(relativePath) : relativePath;`
`232`	`232`	`}`
`233`	`233`	`let fromPath = from.path \|\| '/', toPath = to.path \|\| '/';`