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:49:17 +01:00
parent 419c2dc09c 210fc3c072
commit a63ee85284
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,11 +35,15 @@ export class ExtHostWorkspace {
let path: string;
if (typeof pathOrUri === 'string') {
path = pathOrUri;
} else {
} else if (typeof pathOrUri !== 'undefined') {
path = pathOrUri.fsPath;
}
if (!path || !this._workspacePath) {
if (!path) {
return path;
}
if (!this._workspacePath) {
return normalize(path);
}