From acaf2ed2ac8d4fee6549428ca1fe90a8ca5d7c8d Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Tue, 9 Feb 2021 14:36:52 +0100 Subject: [PATCH] fix tests --- .../common/userDataAutoSyncService.ts | 5 ++--- .../browser/userDataAutoSyncEnablementService.ts | 15 +++++++-------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/vs/platform/userDataSync/common/userDataAutoSyncService.ts b/src/vs/platform/userDataSync/common/userDataAutoSyncService.ts index 3475c908c84..0a4a2fded18 100644 --- a/src/vs/platform/userDataSync/common/userDataAutoSyncService.ts +++ b/src/vs/platform/userDataSync/common/userDataAutoSyncService.ts @@ -73,10 +73,9 @@ export class UserDataAutoSyncEnablementService extends Disposable implements _IU } setEnablement(enabled: boolean): void { - if (!this.canToggleEnablement()) { - throw new Error('Cannot toggle enablement'); + if (this.canToggleEnablement()) { + this.storageService.store(enablementKey, enabled, StorageScope.GLOBAL, StorageTarget.MACHINE); } - this.storageService.store(enablementKey, enabled, StorageScope.GLOBAL, StorageTarget.MACHINE); } private onDidStorageChange(storageChangeEvent: IStorageValueChangeEvent): void { diff --git a/src/vs/workbench/services/userDataSync/browser/userDataAutoSyncEnablementService.ts b/src/vs/workbench/services/userDataSync/browser/userDataAutoSyncEnablementService.ts index b031067980d..af14b952ca6 100644 --- a/src/vs/workbench/services/userDataSync/browser/userDataAutoSyncEnablementService.ts +++ b/src/vs/workbench/services/userDataSync/browser/userDataAutoSyncEnablementService.ts @@ -29,14 +29,13 @@ export class WebUserDataAutoSyncEnablementService extends UserDataAutoSyncEnable } setEnablement(enabled: boolean) { - if (!this.canToggleEnablement()) { - throw new Error('Cannot toggle enablement'); - } - if (this.enabled !== enabled) { - this.enabled = enabled; - super.setEnablement(enabled); - if (this.workbenchEnvironmentService.options?.settingsSyncOptions?.enablementHandler) { - this.workbenchEnvironmentService.options.settingsSyncOptions.enablementHandler(this.enabled); + if (this.canToggleEnablement()) { + if (this.enabled !== enabled) { + this.enabled = enabled; + super.setEnablement(enabled); + if (this.workbenchEnvironmentService.options?.settingsSyncOptions?.enablementHandler) { + this.workbenchEnvironmentService.options.settingsSyncOptions.enablementHandler(this.enabled); + } } } }