Skip to content

Commit 89e6f7e

Browse files
authored
Remove assignment service from toggle data fetch (microsoft#196767)
1 parent 9ea20d5 commit 89e6f7e

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ import { ISettingOverrideClickEvent } from 'vs/workbench/contrib/preferences/bro
6262
import { ConfigurationScope, Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
6363
import { Registry } from 'vs/platform/registry/common/platform';
6464
import { defaultButtonStyles } from 'vs/platform/theme/browser/defaultStyles';
65-
import { IWorkbenchAssignmentService } from 'vs/workbench/services/assignment/common/assignmentService';
6665
import { IProductService } from 'vs/platform/product/common/productService';
6766
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
6867
import { registerNavigableContainer } from 'vs/workbench/browser/actions/widgetNavigationCommands';
@@ -237,7 +236,6 @@ export class SettingsEditor2 extends EditorPane {
237236
@IExtensionService private readonly extensionService: IExtensionService,
238237
@ILanguageService private readonly languageService: ILanguageService,
239238
@IExtensionManagementService extensionManagementService: IExtensionManagementService,
240-
@IWorkbenchAssignmentService private readonly workbenchAssignmentService: IWorkbenchAssignmentService,
241239
@IProductService private readonly productService: IProductService,
242240
@IEnvironmentService private readonly environmentService: IEnvironmentService,
243241
@IExtensionGalleryService private readonly extensionGalleryService: IExtensionGalleryService,
@@ -1291,7 +1289,7 @@ export class SettingsEditor2 extends EditorPane {
12911289
}
12921290

12931291
const additionalGroups: ISettingsGroup[] = [];
1294-
const toggleData = await getExperimentalExtensionToggleData(this.extensionGalleryService, this.workbenchAssignmentService, this.environmentService, this.productService);
1292+
const toggleData = await getExperimentalExtensionToggleData(this.extensionGalleryService, this.environmentService, this.productService);
12951293
if (toggleData && groups.filter(g => g.extensionInfo).length) {
12961294
for (const key in toggleData.settingsEditorRecommendedExtensions) {
12971295
const extension = toggleData.recommendedExtensionsGalleryInfo[key];

src/vs/workbench/contrib/preferences/common/preferences.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
1111
import { IExtensionGalleryService, IGalleryExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
1212
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
1313
import { IProductService } from 'vs/platform/product/common/productService';
14-
import { IWorkbenchAssignmentService } from 'vs/workbench/services/assignment/common/assignmentService';
1514
import { ISearchResult, ISettingsEditorModel } from 'vs/workbench/services/preferences/common/preferences';
1615

1716
export interface IWorkbenchSettingsConfiguration {
@@ -108,7 +107,7 @@ export type ExtensionToggleData = {
108107

109108
let cachedExtensionToggleData: ExtensionToggleData | undefined;
110109

111-
export async function getExperimentalExtensionToggleData(extensionGalleryService: IExtensionGalleryService, workbenchAssignmentService: IWorkbenchAssignmentService, environmentService: IEnvironmentService, productService: IProductService): Promise<ExtensionToggleData | undefined> {
110+
export async function getExperimentalExtensionToggleData(extensionGalleryService: IExtensionGalleryService, environmentService: IEnvironmentService, productService: IProductService): Promise<ExtensionToggleData | undefined> {
112111
if (!ENABLE_EXTENSION_TOGGLE_SETTINGS) {
113112
return undefined;
114113
}
@@ -121,8 +120,7 @@ export async function getExperimentalExtensionToggleData(extensionGalleryService
121120
return cachedExtensionToggleData;
122121
}
123122

124-
const isTreatment = await workbenchAssignmentService.getTreatment<boolean>('ExtensionToggleSettings');
125-
if ((isTreatment || !environmentService.isBuilt) && productService.extensionRecommendations && productService.commonlyUsedSettings) {
123+
if (!environmentService.isBuilt && productService.extensionRecommendations && productService.commonlyUsedSettings) {
126124
const settingsEditorRecommendedExtensions: IStringDictionary<IExtensionRecommendations> = {};
127125
Object.keys(productService.extensionRecommendations).forEach(extensionId => {
128126
const extensionInfo = productService.extensionRecommendations![extensionId];

0 commit comments

Comments
 (0)