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

Fix #103005

Browse Source
This commit is contained in:
Sandeep Somavarapu
2020-07-21 13:54:34 +02:00
parent eb1ca267d6
commit b8405ce0b8
13 changed files with 59 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vs/workbench/services/userDataSync/electron-browser/userDataSyncService.ts
View File

@@ -102,7 +102,7 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
return this.channel.call('hasLocalData');
}
accept(syncResource: SyncResource, resource: URI, content: string, apply: boolean): Promise<void> {
accept(syncResource: SyncResource, resource: URI, content: string | null, apply: boolean): Promise<void> {
return this.channel.call('accept', [syncResource, resource, content, apply]);
}
@@ -186,7 +186,7 @@ class ManualSyncTask implements IManualSyncTask {
return this.deserializePreviews(previews);
}
async accept(resource: URI, content: string): Promise<[SyncResource, ISyncResourcePreview][]> {
async accept(resource: URI, content: string | null): Promise<[SyncResource, ISyncResourcePreview][]> {
const previews = await this.channel.call<[SyncResource, ISyncResourcePreview][]>('accept', [resource, content]);
return this.deserializePreviews(previews);
}