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

Merge branch 'master' into joh/progress-api

Browse Source
This commit is contained in:
Johannes Rieken
2017-01-17 09:12:37 +01:00
parent cfd71c7815 588b14b5bd
commit ace744e468
22 changed files with 249 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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[]> {