fix: prevent duplicate disable actions in extension dropdown #285636
+46
−0
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When an extension is disabled globally but enabled in the workspace, the 'Disable' (Global) action was still enabled in the dropdown menu, leading to both 'Disable' and 'Disable (Workspace)' being visible. Clicking 'Disable' had no effect as it was already disabled globally. This change ensures 'Disable' action is only enabled if the extension is NOT already disabled globally. Fixes microsoft#244138
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes a bug in the extension dropdown menu where the "Disable" action was incorrectly shown when an extension was already disabled globally but had a workspace override to enable it (EnabledWorkspace state).
Key Changes:
- Added an explicit check using
isDisabledGlobally()to theDisableGloballyAction.update()method to prevent the action from being enabled when the extension is already disabled globally
| if (this.extension && this.extension.local && !this.extension.isWorkspaceScoped && this.extensionService.extensions.some(e => areSameExtensions({ id: e.identifier.value, uuid: e.uuid }, this.extension!.identifier))) { | ||
| this.enabled = this.extension.state === ExtensionState.Installed | ||
| && (this.extension.enablementState === EnablementState.EnabledGlobally || this.extension.enablementState === EnablementState.EnabledWorkspace) | ||
| && !this.extensionEnablementService.isDisabledGlobally(this.extension.local) |
There was a problem hiding this comment.
This fix addresses the scenario where an extension is disabled globally but has a workspace override to enable it (i.e., enablementState is EnabledWorkspace). However, there doesn't appear to be a test case in the test suite that covers this specific scenario. Consider adding a test case similar to the existing ones in extensionsActions.test.ts that:
- Disables an extension globally using setEnablement with EnablementState.DisabledGlobally
- Then enables it for workspace using setEnablement with EnablementState.EnabledWorkspace
- Verifies that DisableGloballyAction is disabled in this state
This would ensure the fix continues to work correctly in the future.
Add test case for DisableGloballyAction when an extension is disabled globally but has a workspace override to enable it. This ensures the action remains disabled in this edge case.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
When an extension is in the state:
The "Disable" button dropdown would show both:
The "Disable" action (global) should not be shown because the extension is already disabled globally. The "Disable (Workspace)" action is the correct one to disable the workspace override.
Change
Modified
DisableGloballyAction.update()insrc/vs/workbench/contrib/extensions/browser/extensionsActions.tsto explicitly check if the extension is already disabled globally.If it is already disabled globally, the action becomes disabled.
Fixes #244138