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

refactor sync to reflect preview, merge, accept & apply.

Browse Source
This commit is contained in:
Sandeep Somavarapu
2020-07-26 22:15:23 +02:00
parent e2de23c683
commit 8ca1cf6293
18 changed files with 657 additions and 991 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
View File

@@ -594,7 +594,7 @@ class UserDataSyncPreview extends Disposable implements IUserDataSyncPreview {
this.updateResources();
}
async accept(syncResource: SyncResource, resource: URI, content: string | null): Promise<void> {
async accept(syncResource: SyncResource, resource: URI, content?: string | null): Promise<void> {
if (this.manualSync) {
const syncPreview = await this.manualSync.task.accept(resource, content);
this.updatePreview(syncPreview);