Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 19:18:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

#100346 Use resource previews and remove conflict type

Browse Source
This commit is contained in:
Sandeep Somavarapu
2020-07-09 12:37:24 +02:00
parent 802572340b
commit 793c1b28cb
8 changed files with 151 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,8 +103,8 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
return this.channel.call('isFirstTimeSyncingWithAnotherMachine');
}
acceptConflict(conflict: URI, content: string): Promise<void> {
return this.channel.call('acceptConflict', [conflict, content]);
acceptPreviewContent(resource: URI, content: string): Promise<void> {
return this.channel.call('acceptPreviewContent', [resource, content]);
}
resolveContent(resource: URI): Promise<string | null> {
@@ -140,8 +140,13 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
this._conflicts = conflicts.map(c =>
({
syncResource: c.syncResource,
conflicts: c.conflicts.map(({ local, remote }) =>
({ local: URI.revive(local), remote: URI.revive(remote) }))
conflicts: c.conflicts.map(r =>
({
...r,
localResource: URI.revive(r.localResource),
remoteResource: URI.revive(r.remoteResource),
previewResource: URI.revive(r.previewResource),
}))
}));
this._onDidChangeConflicts.fire(conflicts);
}