path labels: if resource belongs to a root to show relative label use paths not toString (it encodes)

isidorn · isidorn · commit 3ff43d06f7e1 · 2018-06-21T10:15:22.000+02:00
fixes microsoft#52512
diff --git a/src/vs/base/common/labels.ts b/src/vs/base/common/labels.ts
@@ -45,7 +45,7 @@ export function getPathLabel(resource: URI | string, userHomeProvider: IUserHome
 		if (isEqual(baseResource.uri, resource, !isLinux)) {
 			pathLabel = ''; // no label if paths are identical
 		} else {
-			pathLabel = normalize(ltrim(resource.toString().substr(baseResource.uri.toString().length), sep), true);
+			pathLabel = normalize(ltrim(resource.path.substr(baseResource.uri.path.length), sep), true);
 		}
 
 		if (hasMultipleRoots) {

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ export function getPathLabel(resource: URI \| string, userHomeProvider: IUserHome`
`45`	`45`	`if (isEqual(baseResource.uri, resource, !isLinux)) {`
`46`	`46`	`pathLabel = ''; // no label if paths are identical`
`47`	`47`	`} else {`
`48`		`- pathLabel = normalize(ltrim(resource.toString().substr(baseResource.uri.toString().length), sep), true);`
	`48`	`+ pathLabel = normalize(ltrim(resource.path.substr(baseResource.uri.path.length), sep), true);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`if (hasMultipleRoots) {`