normalize path

jrieken · jrieken · commit 588b14b5bdff · 2017-01-17T09:07:15.000+01:00
diff --git a/src/vs/workbench/api/node/extHostWorkspace.ts b/src/vs/workbench/api/node/extHostWorkspace.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import URI from 'vs/base/common/uri';
-// import { relative, isEqualOrParent } from 'vs/base/common/paths';
+import { normalize } from 'vs/base/common/paths';
 import { relative } from 'path';
 import { IThreadService } from 'vs/workbench/services/thread/common/threadService';
 import { IResourceEdit } from 'vs/editor/common/services/bulkEdit';
@@ -40,15 +40,15 @@ export class ExtHostWorkspace {
 		}
 
 		if (!path || !this._workspacePath) {
-			return path;
+			return normalize(path);
 		}
 
 		let result = relative(this._workspacePath, path);
 		if (!result || result.indexOf('..') === 0) {
-			return path;
+			return normalize(path);
 		}
 
-		return result;
+		return normalize(result);
 	}
 
 	findFiles(include: string, exclude: string, maxResults?: number, token?: vscode.CancellationToken): Thenable<vscode.Uri[]> {

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`'use strict';`
`6`	`6`
`7`	`7`	`import URI from 'vs/base/common/uri';`
`8`		`-// import { relative, isEqualOrParent } from 'vs/base/common/paths';`
	`8`	`+import { normalize } from 'vs/base/common/paths';`
`9`	`9`	`import { relative } from 'path';`
`10`	`10`	`import { IThreadService } from 'vs/workbench/services/thread/common/threadService';`
`11`	`11`	`import { IResourceEdit } from 'vs/editor/common/services/bulkEdit';`
`@@ -40,15 +40,15 @@ export class ExtHostWorkspace {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`if (!path \|\| !this._workspacePath) {`
`43`		`- return path;`
	`43`	`+ return normalize(path);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`let result = relative(this._workspacePath, path);`
`47`	`47`	`if (!result \|\| result.indexOf('..') === 0) {`
`48`		`- return path;`
	`48`	`+ return normalize(path);`
`49`	`49`	`}`
`50`	`50`
`51`		`- return result;`
	`51`	`+ return normalize(result);`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`findFiles(include: string, exclude: string, maxResults?: number, token?: vscode.CancellationToken): Thenable<vscode.Uri[]> {`