From cfa6daa6b9f1396237cc0b2b81cb993715848d62 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Tue, 11 Feb 2020 08:55:51 +0100 Subject: [PATCH] migrate sync conf only when sync is configured --- .../browser/userDataSync.contribution.ts | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.contribution.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.contribution.ts index f728e0e9a68..5bd817b28e6 100644 --- a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.contribution.ts +++ b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.contribution.ts @@ -8,7 +8,7 @@ import { Registry } from 'vs/platform/registry/common/platform'; import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle'; import { UserDataSyncWorkbenchContribution } from 'vs/workbench/contrib/userDataSync/browser/userDataSync'; import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration'; -import { IUserDataSyncEnablementService } from 'vs/platform/userDataSync/common/userDataSync'; +import { IUserDataSyncEnablementService, getUserDataSyncStore } from 'vs/platform/userDataSync/common/userDataSync'; class UserDataSyncSettingsMigrationContribution implements IWorkbenchContribution { @@ -16,22 +16,24 @@ class UserDataSyncSettingsMigrationContribution implements IWorkbenchContributio @IConfigurationService private readonly configurationService: IConfigurationService, @IUserDataSyncEnablementService userDataSyncEnablementService: IUserDataSyncEnablementService, ) { - if (!configurationService.getValue('sync.enableSettings')) { - userDataSyncEnablementService.setResourceEnablement('settings', false); + if (getUserDataSyncStore(configurationService)) { + if (!configurationService.getValue('sync.enableSettings')) { + userDataSyncEnablementService.setResourceEnablement('settings', false); + } + if (!configurationService.getValue('sync.enableKeybindings')) { + userDataSyncEnablementService.setResourceEnablement('keybindings', false); + } + if (!configurationService.getValue('sync.enableUIState')) { + userDataSyncEnablementService.setResourceEnablement('globalState', false); + } + if (!configurationService.getValue('sync.enableExtensions')) { + userDataSyncEnablementService.setResourceEnablement('extensions', false); + } + if (configurationService.getValue('sync.enable')) { + userDataSyncEnablementService.setEnablement(true); + } + this.removeFromConfiguration(); } - if (!configurationService.getValue('sync.enableKeybindings')) { - userDataSyncEnablementService.setResourceEnablement('keybindings', false); - } - if (!configurationService.getValue('sync.enableUIState')) { - userDataSyncEnablementService.setResourceEnablement('globalState', false); - } - if (!configurationService.getValue('sync.enableExtensions')) { - userDataSyncEnablementService.setResourceEnablement('extensions', false); - } - if (configurationService.getValue('sync.enable')) { - userDataSyncEnablementService.setEnablement(true); - } - this.removeFromConfiguration(); } private async removeFromConfiguration(): Promise {