development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-28 05:19:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

set turning on context using enablement and sync status

Browse source
This commit is contained in:
Sandeep Somavarapu 2020-07-24 12:35:22 +02:00
parent 8ef53a3f08
commit f6ec272bbd
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
View file

@ -149,9 +149,20 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
textModelResolverService.registerTextModelContentProvider(USER_DATA_SYNC_SCHEME, instantiationService.createInstance(UserDataRemoteContentProvider));
registerEditorContribution(AcceptChangesContribution.ID, AcceptChangesContribution);
this._register(Event.any(userDataSyncService.onDidChangeStatus, userDataAutoSyncService.onDidChangeEnablement)(() => this.turningOnSync = !userDataAutoSyncService.isEnabled() && userDataSyncService.status !== SyncStatus.Idle));
}
}
private get turningOnSync(): boolean {
return !!this.turningOnSyncContext.get();
}
private set turningOnSync(turningOn: boolean) {
this.turningOnSyncContext.set(turningOn);
this.updateGlobalActivityBadge();
}
private readonly conflictsDisposables = new Map<SyncResource, IDisposable>();
private onDidChangeConflicts(conflicts: [SyncResource, IResourcePreview[]][]) {
if (!this.userDataAutoSyncService.isEnabled()) {
@ -417,17 +428,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
}
}
private get turningOnSync(): boolean {
return !!this.turningOnSyncContext.get();
}
private set turningOnSync(turningOn: boolean) {
this.turningOnSyncContext.set(turningOn);
this.updateGlobalActivityBadge();
}
private async turnOn(): Promise<void> {
this.turningOnSync = true;
try {
if (!this.storageService.getBoolean('sync.donotAskPreviewConfirmation', StorageScope.GLOBAL, false)) {
if (!await this.askForConfirmation()) {
@ -477,8 +478,6 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
}
}
this.notificationService.error(localize('turn on failed', "Error while starting Sync: {0}", toErrorMessage(e)));
} finally {
this.turningOnSync = false;
}
}