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

getWorkspaceFolder return a workspace folder when called with one, fixes #34843

Browse Source
This commit is contained in:
Johannes Rieken
2017-09-28 11:36:33 +02:00
parent 7ab323eef9
commit 93dfa359fa
3 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,11 +40,9 @@ class Workspace2 extends Workspace {
return this._workspaceFolders.slice(0);
}
getWorkspaceFolder(uri: URI): vscode.WorkspaceFolder {
let folder = this._structure.lookUp(uri);
if (folder) {
// `uri` is a workspace folder so we check for
// its parent
getWorkspaceFolder(uri: URI, resolveParent?: boolean): vscode.WorkspaceFolder {
if (resolveParent && this._structure.lookUp(uri)) {
// `uri` is a workspace folder so we check for its parent
uri = uri.with({ path: dirname(uri.path) });
}
return this._structure.findSubstr(uri);
@@ -80,11 +78,11 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape {
}
}
getWorkspaceFolder(uri: vscode.Uri): vscode.WorkspaceFolder {
getWorkspaceFolder(uri: vscode.Uri, resolveParent?: boolean): vscode.WorkspaceFolder {
if (!this._workspace) {
return undefined;
}
return this._workspace.getWorkspaceFolder(<URI>uri);
return this._workspace.getWorkspaceFolder(uri, resolveParent);
}
getPath(): string {
@@ -114,9 +112,9 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape {
return path;
}
const folder = this.getWorkspaceFolder(typeof pathOrUri === 'string'
? URI.file(pathOrUri)
: pathOrUri
const folder = this.getWorkspaceFolder(
typeof pathOrUri === 'string' ? URI.file(pathOrUri) : pathOrUri,
true
);
if (!folder) {