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

show diff editor for keybindings conflicts

Browse Source
This commit is contained in:
Sandeep Somavarapu
2020-01-20 22:50:13 +01:00
parent 4461c1649d
commit 0d71c3325f
13 changed files with 73 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { SyncStatus, ISettingsSyncService, IConflictSetting } from 'vs/platform/userDataSync/common/userDataSync';
import { SyncStatus, ISettingsSyncService, IConflictSetting, SyncSource } from 'vs/platform/userDataSync/common/userDataSync';
import { ISharedProcessService } from 'vs/platform/ipc/electron-browser/sharedProcessService';
import { Disposable } from 'vs/base/common/lifecycle';
import { Emitter, Event } from 'vs/base/common/event';
@@ -16,6 +16,8 @@ export class SettingsSyncService extends Disposable implements ISettingsSyncServ
private readonly channel: IChannel;
readonly source = SyncSource.Settings;
private _status: SyncStatus = SyncStatus.Uninitialized;
get status(): SyncStatus { return this._status; }
private _onDidChangeStatus: Emitter<SyncStatus> = this._register(new Emitter<SyncStatus>());
@@ -81,8 +83,8 @@ export class SettingsSyncService extends Disposable implements ISettingsSyncServ
return this.channel.call('resolveConflicts', [conflicts]);
}
getRemotContent(): Promise<string | null> {
return this.channel.call('getRemotContent');
getRemoteContent(): Promise<string | null> {
return this.channel.call('getRemoteContent');
}
private async updateStatus(status: SyncStatus): Promise<void> {

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

@@ -74,6 +74,10 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
return this.channel.call('hasLocalData');
}
getRemoteContent(source: SyncSource): Promise<string | null> {
return this.channel.call('getRemoteContent', [source]);
}
isFirstTimeSyncAndHasUserData(): Promise<boolean> {
return this.channel.call('isFirstTimeSyncAndHasUserData');
}