From 4bf364de22d1c098fc5754f475a97480c1ef92fd Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Mon, 22 Aug 2022 15:46:41 +0200 Subject: [PATCH] enable profiles (#158758) - by default in insiders - behind the flag in stable --- src/vs/code/electron-main/main.ts | 6 +++--- src/vs/code/node/cliProcessMain.ts | 2 +- src/vs/workbench/browser/web.main.ts | 2 +- .../contrib/relauncher/browser/relauncher.contribution.ts | 2 +- .../contrib/userDataProfile/browser/userDataProfile.ts | 2 +- .../services/userDataProfile/common/userDataProfile.ts | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts index 1a4f72bd620..9699a2755d2 100644 --- a/src/vs/code/electron-main/main.ts +++ b/src/vs/code/electron-main/main.ts @@ -103,7 +103,7 @@ class CodeMain { // Init services try { - await this.initServices(environmentMainService, userDataProfilesMainService, configurationService, stateMainService); + await this.initServices(environmentMainService, userDataProfilesMainService, configurationService, stateMainService, productService); } catch (error) { // Show a dialog for errors that can be resolved by the user @@ -235,7 +235,7 @@ class CodeMain { return instanceEnvironment; } - private async initServices(environmentMainService: IEnvironmentMainService, userDataProfilesMainService: UserDataProfilesMainService, configurationService: ConfigurationService, stateMainService: StateMainService): Promise { + private async initServices(environmentMainService: IEnvironmentMainService, userDataProfilesMainService: UserDataProfilesMainService, configurationService: ConfigurationService, stateMainService: StateMainService, productService: IProductService): Promise { await Promises.settled([ // Environment service (paths) @@ -256,7 +256,7 @@ class CodeMain { configurationService.initialize() ]); - userDataProfilesMainService.setEnablement(!!configurationService.getValue(PROFILES_ENABLEMENT_CONFIG)); + userDataProfilesMainService.setEnablement(productService.quality !== 'stable' || configurationService.getValue(PROFILES_ENABLEMENT_CONFIG)); } private async claimInstance(logService: ILogService, environmentMainService: IEnvironmentMainService, lifecycleMainService: ILifecycleMainService, instantiationService: IInstantiationService, productService: IProductService, retry: boolean): Promise { diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts index eda61ad1689..7aa3b4d7d01 100644 --- a/src/vs/code/node/cliProcessMain.ts +++ b/src/vs/code/node/cliProcessMain.ts @@ -164,7 +164,7 @@ class CliMain extends Disposable { configurationService.initialize() ]); - userDataProfilesService.setEnablement(!!configurationService.getValue(PROFILES_ENABLEMENT_CONFIG)); + userDataProfilesService.setEnablement(productService.quality !== 'stable' || configurationService.getValue(PROFILES_ENABLEMENT_CONFIG)); // URI Identity services.set(IUriIdentityService, new UriIdentityService(fileService)); diff --git a/src/vs/workbench/browser/web.main.ts b/src/vs/workbench/browser/web.main.ts index e61e6f06745..639c9a41b6c 100644 --- a/src/vs/workbench/browser/web.main.ts +++ b/src/vs/workbench/browser/web.main.ts @@ -304,7 +304,7 @@ export class BrowserMain extends Disposable { }) ]); - userDataProfilesService.setEnablement(!!configurationService.getValue(PROFILES_ENABLEMENT_CONFIG)); + userDataProfilesService.setEnablement(productService.quality !== 'stable' || configurationService.getValue(PROFILES_ENABLEMENT_CONFIG)); this._register(configurationService.onDidChangeConfiguration(e => { if (e.affectsConfiguration(PROFILES_ENABLEMENT_CONFIG)) { userDataProfilesService.setEnablement(!!configurationService.getValue(PROFILES_ENABLEMENT_CONFIG)); diff --git a/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts b/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts index 8e749ba806c..7e58b92cc83 100644 --- a/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts +++ b/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts @@ -118,7 +118,7 @@ export class SettingsChangeRelauncher extends Disposable implements IWorkbenchCo } // Profiles - if (typeof config.workbench?.experimental?.settingsProfiles?.enabled === 'boolean' && config.workbench.experimental.settingsProfiles.enabled !== this.settingsProfilesEnabled) { + if (this.productService.quality === 'stable' && typeof config.workbench?.experimental?.settingsProfiles?.enabled === 'boolean' && config.workbench.experimental.settingsProfiles.enabled !== this.settingsProfilesEnabled) { this.settingsProfilesEnabled = config.workbench.experimental.settingsProfiles.enabled; changed = true; } diff --git a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfile.ts b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfile.ts index c816a7096b2..c40a9cb7a63 100644 --- a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfile.ts +++ b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfile.ts @@ -66,7 +66,7 @@ export class UserDataProfilesWorkbenchContribution extends Disposable implements } private registerConfiguration(): void { - if (this.productService.quality !== 'stable') { + if (this.productService.quality === 'stable') { Registry.as(ConfigurationExtensions.Configuration).registerConfiguration({ ...workbenchConfigurationNodeBase, 'properties': { diff --git a/src/vs/workbench/services/userDataProfile/common/userDataProfile.ts b/src/vs/workbench/services/userDataProfile/common/userDataProfile.ts index d3a0f4c25f1..58d36933d16 100644 --- a/src/vs/workbench/services/userDataProfile/common/userDataProfile.ts +++ b/src/vs/workbench/services/userDataProfile/common/userDataProfile.ts @@ -76,6 +76,6 @@ export const PROFILES_TTILE = { value: localize('settings profiles', "Settings P export const PROFILES_CATEGORY = PROFILES_TTILE.value; export const PROFILE_EXTENSION = 'code-profile'; export const PROFILE_FILTER = [{ name: localize('profile', "Settings Profile"), extensions: [PROFILE_EXTENSION] }]; -export const PROFILES_ENABLEMENT_CONTEXT = ContextKeyExpr.and(ProductQualityContext.notEqualsTo('stable'), ContextKeyDefinedExpr.create(`config.${PROFILES_ENABLEMENT_CONFIG}`)); +export const PROFILES_ENABLEMENT_CONTEXT = ContextKeyExpr.or(ProductQualityContext.notEqualsTo('stable'), ContextKeyDefinedExpr.create(`config.${PROFILES_ENABLEMENT_CONFIG}`)); export const CURRENT_PROFILE_CONTEXT = new RawContextKey('currentSettingsProfile', ''); export const HAS_PROFILES_CONTEXT = new RawContextKey('hasSettingsProfiles', false);