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

#100346 Prepare for manual sync

Browse Source
This commit is contained in:
Sandeep Somavarapu
2020-07-13 16:14:45 +02:00
parent c828a5339b
commit 40c9a33800
3 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,7 +143,7 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
previewResource: URI.revive(r.previewResource),
}))
]));
this._onDidChangeConflicts.fire(conflicts);
this._onDidChangeConflicts.fire(this._conflicts);
}
private updateLastSyncTime(lastSyncTime: number): void {
@@ -170,27 +170,17 @@ class ManualSyncTask implements IManualSyncTask {
async preview(): Promise<[SyncResource, ISyncResourcePreview][]> {
const previews = await this.channel.call<[SyncResource, ISyncResourcePreview][]>('preview');
return previews.map(([syncResource, preview]) =>
([
syncResource,
{
isLastSyncFromCurrentMachine: preview.isLastSyncFromCurrentMachine,
resourcePreviews: preview.resourcePreviews.map(r => ({
...r,
localResource: URI.revive(r.localResource),
remoteResource: URI.revive(r.remoteResource),
previewResource: URI.revive(r.previewResource),
}))
}
]));
return this.deserializePreviews(previews);
}
accept(resource: URI, content: string): Promise<[SyncResource, ISyncResourcePreview][]> {
return this.channel.call('accept', [resource, content]);
async accept(resource: URI, content: string): Promise<[SyncResource, ISyncResourcePreview][]> {
const previews = await this.channel.call<[SyncResource, ISyncResourcePreview][]>('accept', [resource, content]);
return this.deserializePreviews(previews);
}
merge(resource?: URI): Promise<[SyncResource, ISyncResourcePreview][]> {
return this.channel.call('merge', [resource]);
async merge(resource?: URI): Promise<[SyncResource, ISyncResourcePreview][]> {
const previews = await this.channel.call<[SyncResource, ISyncResourcePreview][]>('merge', [resource]);
return this.deserializePreviews(previews);
}
pull(): Promise<void> {
@@ -208,6 +198,22 @@ class ManualSyncTask implements IManualSyncTask {
dispose(): void {
this.channel.call('dispose');
}
private deserializePreviews(previews: [SyncResource, ISyncResourcePreview][]): [SyncResource, ISyncResourcePreview][] {
return previews.map(([syncResource, preview]) =>
([
syncResource,
{
isLastSyncFromCurrentMachine: preview.isLastSyncFromCurrentMachine,
resourcePreviews: preview.resourcePreviews.map(r => ({
...r,
localResource: URI.revive(r.localResource),
remoteResource: URI.revive(r.remoteResource),
previewResource: URI.revive(r.previewResource),
}))
}
]));
}
}
registerSingleton(IUserDataSyncService, UserDataSyncService);