debugger: Ensure both debug and regular global tasks are correctly merged #27184
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
cla-bot
bot
added
the
cla-signed
Contributor
Author
|
/cherry-pick v0.179.x |
gcp-cherry-pick-bot bot
pushed a commit
that referenced
this pull request
Mar 20, 2025
…rged (#27184) Follow-up of #13433 Closes #27124 Closes #27066 After this change, both old global task source, `tasks.json` and new, `debug.json` started to call for the same task update method: https://github.com/zed-industries/zed/blob/14920ab910c6d0208d23ce6b6e2ed644e6f20f2e/crates/project/src/task_inventory.rs#L414 erasing previous declarations. The PR puts this data under different paths instead and adjusts the code around it. Release Notes: - Fixed custom tasks not shown
SomeoneToIgnore
added a commit
that referenced
this pull request
Mar 20, 2025
…rged (cherry-pick #27184) (#27187) Cherry-picked debugger: Ensure both debug and regular global tasks are correctly merged (#27184) Follow-up of #13433 Closes #27124 Closes #27066 After this change, both old global task source, `tasks.json` and new, `debug.json` started to call for the same task update method: https://github.com/zed-industries/zed/blob/14920ab910c6d0208d23ce6b6e2ed644e6f20f2e/crates/project/src/task_inventory.rs#L414 erasing previous declarations. The PR puts this data under different paths instead and adjusts the code around it. Release Notes: - Fixed custom tasks not shown Co-authored-by: Kirill Bulatov <kirill@zed.dev>
Contributor
|
Thank you for catching this |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Follow-up of #13433
Closes #27124
Closes #27066
Closes #27150
After this change, both old global task source,
tasks.jsonand new,debug.jsonstarted to call for the same task update method:zed/crates/project/src/task_inventory.rs
Line 414 in 14920ab
erasing previous declarations.
The PR puts this data under different paths instead and adjusts the code around it.
Release Notes: