ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-01 01:25:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge VS Code 1.31.1 (#4283)

Browse Source
This commit is contained in:
Matt Irvine
2019-03-15 13:09:45 -07:00
committed by GitHub
parent 7d31575149
commit 86bac90001
1716 changed files with 53308 additions and 48375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/vs/platform/workspace/common/workspace.ts
View File

@@ -46,7 +46,13 @@ export interface IWorkspaceContextService {
onDidChangeWorkspaceFolders: Event<IWorkspaceFoldersChangeEvent>;
/**
* Provides access to the workspace object the platform is running with.
* Provides access to the complete workspace object.
*/
getCompleteWorkspace(): Promise<IWorkspace>;
/**
* Provides access to the workspace object the window is running with.
* Use `getCompleteWorkspace` to get complete workspace object.
*/
getWorkspace(): IWorkspace;
@@ -225,7 +231,7 @@ export function toWorkspaceFolders(configuredFolders: IStoredWorkspaceFolder[],
.map(({ uri, raw, name }, index) => new WorkspaceFolder({ uri, name: name || resources.basenameOrAuthority(uri), index }, raw));
}
function parseWorkspaceFolders(configuredFolders: IStoredWorkspaceFolder[], relativeTo: URI | undefined): (WorkspaceFolder | undefined)[] {
function parseWorkspaceFolders(configuredFolders: IStoredWorkspaceFolder[], relativeTo: URI | undefined): Array<WorkspaceFolder | undefined> {
return configuredFolders.map((configuredFolder, index) => {
let uri: URI | null = null;
if (isRawFileWorkspaceFolder(configuredFolder)) {
@@ -243,7 +249,7 @@ function parseWorkspaceFolders(configuredFolders: IStoredWorkspaceFolder[], rela
}
}
if (!uri) {
return void 0;
return undefined;
}
return new WorkspaceFolder({ uri, name: configuredFolder.name! /*is ensured in caller*/, index }, configuredFolder);
});