task: Skip .vscode tasks when .zed/tasks.json exists#51797
Merged
SomeoneToIgnore merged 1 commit intozed-industries:mainfrom Mar 24, 2026
Merged
task: Skip .vscode tasks when .zed/tasks.json exists#51797SomeoneToIgnore merged 1 commit intozed-industries:mainfrom
SomeoneToIgnore merged 1 commit intozed-industries:mainfrom
Conversation
Moves the .vscode task filtering from the modal presentation layer down into the inventory's worktree_scenarios(), so all consumers get the correct behavior. Also filters previously spawned .vscode tasks from the used-tasks list when .zed tasks are present. The previous fix in zed-industries#32590 only filtered .vscode tasks in the task picker modal, missing other code paths and the used-tasks list.
|
We require contributors to sign our Contributor License Agreement, and we don't have @moktamd on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'. |
Contributor
|
@cla-bot check |
|
The cla-bot has been summoned, and re-checked this pull request! |
SomeoneToIgnore
approved these changes
Mar 24, 2026
Contributor
SomeoneToIgnore
left a comment
There was a problem hiding this comment.
Would be good to extract all the repeated filtering logic into a shared fn, but nonetheless great PR, thank you!
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Fixes #51733
The previous fix in #32590 only filtered
.vscodetasks at the modal presentation layer, so they still appeared in other code paths and in the used-tasks list. This moves the filtering intoworktree_scenarios()in the task inventory, so all consumers see the correct behavior.Changes:
InventoryFor::worktree_scenarios()now skips.vscodeentries when.zedentries exist for the same worktreeused_and_current_resolved_tasks()filters previously spawned.vscodetasks from the used-tasks list.vscodefilter from the task picker modalRelease Notes: