Skip to content

task: Don't show VSCode worktree tasks when Zed ones exist#32590

Merged
P1n3appl3 merged 1 commit intomainfrom
dedup-tasks
Jun 12, 2025
Merged

task: Don't show VSCode worktree tasks when Zed ones exist#32590
P1n3appl3 merged 1 commit intomainfrom
dedup-tasks

Conversation

@P1n3appl3
Copy link
Copy Markdown
Contributor

Fixes #23110

Similar to #32589, we may eventually want to merge instead of making these lists mutually exclusive.

Release Notes:

  • N/A

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Jun 12, 2025
@P1n3appl3 P1n3appl3 enabled auto-merge (squash) June 12, 2025 01:12
@P1n3appl3 P1n3appl3 merged commit f428d54 into main Jun 12, 2025
22 of 23 checks passed
@P1n3appl3 P1n3appl3 deleted the dedup-tasks branch June 12, 2025 01:24
moktamd added a commit to moktamd/zed that referenced this pull request Mar 18, 2026
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.
SomeoneToIgnore pushed a commit that referenced this pull request Mar 24, 2026
Fixes #51733

The previous fix in #32590 only filtered `.vscode` tasks at the modal
presentation layer, so they still appeared in other code paths and in
the used-tasks list. This moves the filtering into
`worktree_scenarios()` in the task inventory, so all consumers see the
correct behavior.

Changes:
- `InventoryFor::worktree_scenarios()` now skips `.vscode` entries when
`.zed` entries exist for the same worktree
- `used_and_current_resolved_tasks()` filters previously spawned
`.vscode` tasks from the used-tasks list
- Removes the now-redundant `.vscode` filter from the task picker modal

Release Notes:

- Fixed .vscode/tasks.json still being used when .zed/tasks.json is
present

Co-authored-by: moktamd <moktamd@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed The user has signed the Contributor License Agreement

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Zed should not load .vscode/tasks.json if .zed/tasks.json is found

1 participant