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

#86681 Change API to access conflict settings in sync way

Browse Source
This commit is contained in:
Sandeep Somavarapu
2020-01-09 13:22:46 +01:00
parent 4cfb719aa1
commit cd4472ed5f
4 changed files with 47 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/vs/workbench/services/userDataSync/electron-browser/settingsSyncService.ts
View File

@@ -21,6 +21,11 @@ export class SettingsSyncService extends Disposable implements ISettingsSyncServ
private _onDidChangeStatus: Emitter<SyncStatus> = this._register(new Emitter<SyncStatus>());
readonly onDidChangeStatus: Event<SyncStatus> = this._onDidChangeStatus.event;
private _conflicts: IConflictSetting[] = [];
get conflicts(): IConflictSetting[] { return this._conflicts; }
private _onDidChangeConflicts: Emitter<IConflictSetting[]> = this._register(new Emitter<IConflictSetting[]>());
readonly onDidChangeConflicts: Event<IConflictSetting[]> = this._onDidChangeConflicts.event;
get onDidChangeLocal(): Event<void> { return this.channel.listen('onDidChangeLocal'); }
constructor(
@@ -32,6 +37,12 @@ export class SettingsSyncService extends Disposable implements ISettingsSyncServ
this.updateStatus(status);
this._register(this.channel.listen<SyncStatus>('onDidChangeStatus')(status => this.updateStatus(status)));
});
this.channel.call<IConflictSetting[]>('_getInitialConflicts').then(conflicts => {
if (conflicts.length) {
this.updateConflicts(conflicts);
}
this._register(this.channel.listen<IConflictSetting[]>('onDidChangeConflicts')(conflicts => this.updateConflicts(conflicts)));
});
}
sync(_continue?: boolean): Promise<boolean> {
@@ -42,10 +53,6 @@ export class SettingsSyncService extends Disposable implements ISettingsSyncServ
this.channel.call('stop');
}
getConflicts(): Promise<IConflictSetting[]> {
return this.channel.call<IConflictSetting[]>('getConflicts');
}
resolveConflicts(conflicts: { key: string, value: any | undefined }[]): Promise<void> {
return this.channel.call('resolveConflicts', [conflicts]);
}
@@ -55,6 +62,11 @@ export class SettingsSyncService extends Disposable implements ISettingsSyncServ
this._onDidChangeStatus.fire(status);
}
private async updateConflicts(conflicts: IConflictSetting[]): Promise<void> {
this._conflicts = conflicts;
this._onDidChangeConflicts.fire(conflicts);
}
}
registerSingleton(ISettingsSyncService, SettingsSyncService);