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

use nodejs-path#relative for workspace#getRelativePath, #18350

Browse Source
This commit is contained in:
Johannes Rieken
2017-01-16 14:40:31 +01:00
parent c3cd923308
commit e9bf909418
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,8 @@
'use strict';
import URI from 'vs/base/common/uri';
import { relative, isEqualOrParent } from 'vs/base/common/paths';
// import { relative, isEqualOrParent } 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';
import { TPromise } from 'vs/base/common/winjs.base';
@@ -38,11 +39,16 @@ export class ExtHostWorkspace {
path = pathOrUri.fsPath;
}
if (isEqualOrParent(path, this._workspacePath)) {
return relative(this._workspacePath, path) || path;
if (!path || !this._workspacePath) {
return path;
}
return path;
let result = relative(this._workspacePath, path);
if (!result || result.indexOf('..') === 0) {
return path;
}
return result;
}
findFiles(include: string, exclude: string, maxResults?: number, token?: vscode.CancellationToken): Thenable<vscode.Uri[]> {