Skip to content

Commit 090790c

Browse files
authored
Fix experiment integration (microsoft#189408)
* Fix experiment integration * Don't set prereleaseExtensionId for now * Set prereleaseExtensionId to stableExtensionId
1 parent 10dc633 commit 090790c

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1252,10 +1252,9 @@ export class SettingsEditor2 extends EditorPane {
12521252
const toggleData = await getExperimentalExtensionToggleData(this.workbenchAssignmentService, this.environmentService, this.productService);
12531253
if (toggleData && groups.filter(g => g.extensionInfo).length) {
12541254
for (const key in toggleData.settingsEditorRecommendedExtensions) {
1255-
const prerelease = toggleData.settingsEditorRecommendedExtensions[key].onSettingsEditorOpen!.prerelease;
1256-
1257-
const extensionId = (typeof prerelease === 'string' && this.productService.quality !== 'stable') ? prerelease : key;
1258-
const [extension] = await this.extensionGalleryService.getExtensions([{ id: extensionId }], CancellationToken.None);
1255+
const extensionId = key;
1256+
// Always recommend prerelease for now.
1257+
const [extension] = await this.extensionGalleryService.getExtensions([{ id: extensionId, preRelease: true }], CancellationToken.None);
12591258
if (!extension) {
12601259
continue;
12611260
}
@@ -1284,8 +1283,8 @@ export class SettingsEditor2 extends EditorPane {
12841283
scope: ConfigurationScope.WINDOW,
12851284
type: 'null',
12861285
displayExtensionId: extensionId,
1286+
prereleaseExtensionId: key,
12871287
stableExtensionId: key,
1288-
prereleaseExtensionId: typeof prerelease === 'string' ? prerelease : key,
12891288
extensionGroupTitle: groupTitle ?? extensionName
12901289
};
12911290
const additionalGroup = this.addOrRemoveManageExtensionSetting(setting, extension, groups);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@ export async function getExperimentalExtensionToggleData(workbenchAssignmentServ
114114
const isTreatment = await workbenchAssignmentService.getTreatment<boolean>('ExtensionToggleSettings');
115115
if ((isTreatment || !environmentService.isBuilt) && productService.extensionRecommendations && productService.commonlyUsedSettings) {
116116
const settingsEditorRecommendedExtensions: Record<string, IExtensionRecommendations> = {};
117-
Object.keys(productService.extensionRecommendations).forEach(key => {
118-
const value = productService.extensionRecommendations![key];
119-
if (value.onSettingsEditorOpen) {
120-
settingsEditorRecommendedExtensions[key] = value;
117+
Object.keys(productService.extensionRecommendations).forEach(extensionId => {
118+
const extensionInfo = productService.extensionRecommendations![extensionId];
119+
if (extensionInfo.onSettingsEditorOpen) {
120+
settingsEditorRecommendedExtensions[extensionId] = extensionInfo;
121121
}
122122
});
123123
cachedExtensionToggleData = {

0 commit comments

Comments
 (0)