use IWorkbenchExtensionEnablementService because know when a globally disabled extension is workspace enabled (#168161)

fixes https://github.com/microsoft/vscode/issues/160460
This commit is contained in:
Johannes Rieken 2022-12-06 12:35:15 +01:00 committed by GitHub
parent 711bdf0066
commit 538a24d505
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -24,6 +24,7 @@ import { IWorkbenchIssueService } from 'vs/workbench/services/issue/common/issue
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
import { Categories } from 'vs/platform/action/common/actionCommonCategories';
import { IWorkbenchExtensionEnablementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
// --- bisect service
@ -235,11 +236,10 @@ registerAction2(class extends Action2 {
const dialogService = accessor.get(IDialogService);
const hostService = accessor.get(IHostService);
const extensionManagement = accessor.get(IExtensionManagementService);
const extensionEnablementService = accessor.get(IGlobalExtensionEnablementService);
const extensionEnablementService = accessor.get(IWorkbenchExtensionEnablementService);
const extensionsBisect = accessor.get(IExtensionBisectService);
const disabled = new Set(extensionEnablementService.getDisabledExtensions().map(id => id.id));
const extensions = (await extensionManagement.getInstalled(ExtensionType.User)).filter(ext => !disabled.has(ext.identifier.id));
const extensions = (await extensionManagement.getInstalled(ExtensionType.User)).filter(ext => extensionEnablementService.isEnabled(ext));
const res = await dialogService.confirm({
message: localize('msg.start', "Extension Bisect"),