Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 11:08:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

use path primitives when compute workspace relative path, fixes #10446

Browse Source
This commit is contained in:
Johannes Rieken
2016-08-12 10:36:21 +02:00
parent a1c1d224d6
commit a0d3321717
3 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vs/workbench/api/node/extHostWorkspace.ts
View File

@@ -5,6 +5,7 @@
'use strict';
import URI from 'vs/base/common/uri';
import {relative, isEqualOrParent} from 'vs/base/common/paths';
import {IThreadService} from 'vs/workbench/services/thread/common/threadService';
import {IResourceEdit} from 'vs/editor/common/services/bulkEdit';
import {TPromise} from 'vs/base/common/winjs.base';
@@ -28,7 +29,7 @@ export class ExtHostWorkspace {
return this._workspacePath;
}
getRelativePath(pathOrUri: string|Uri): string {
getRelativePath(pathOrUri: string | Uri): string {
let path: string;
if (typeof pathOrUri === 'string') {
@@ -37,9 +38,8 @@ export class ExtHostWorkspace {
path = pathOrUri.fsPath;
}
if (this._workspacePath && this._workspacePath.length < path.length) {
// return relative(workspacePath, path);
return path.substring(this._workspacePath.length);
if (isEqualOrParent(path, this._workspacePath)) {
return relative(this._workspacePath, path);
}
return path;