Merge from vscode 4d91d96e5e121b38d33508cdef17868bab255eae

This commit is contained in:
ADS Merger
2020-06-18 04:32:54 +00:00
committed by AzureDataStudio
parent a971aee5bd
commit 5e7071e466
1002 changed files with 24201 additions and 13193 deletions

View File

@@ -59,7 +59,7 @@ export interface IWorkspaceProvider {
export class BrowserHostService extends Disposable implements IHostService {
_serviceBrand: undefined;
declare readonly _serviceBrand: undefined;
private workspaceProvider: IWorkspaceProvider;
@@ -224,7 +224,7 @@ export class BrowserHostService extends Disposable implements IHostService {
(async () => {
// Wait for the resources to be closed in the editor...
await this.editorService.whenClosed(fileOpenables.map(openable => openable.fileUri), { waitForSaved: true });
await this.editorService.whenClosed(fileOpenables.map(openable => ({ resource: openable.fileUri })), { waitForSaved: true });
// ...before deleting the wait marker file
await this.fileService.del(waitMarkerFileURI);