Skip to content

cli: Make zed --wait --diff not wait until window close#54367

Merged
ChristopherBiscardi merged 1 commit intozed-industries:mainfrom
timvermeulen:fix-cli-wait-diff
Apr 21, 2026
Merged

cli: Make zed --wait --diff not wait until window close#54367
ChristopherBiscardi merged 1 commit intozed-industries:mainfrom
timvermeulen:fix-cli-wait-diff

Conversation

@timvermeulen
Copy link
Copy Markdown
Contributor

zed --wait --diff <left> <right> currently waits for the entire window to close instead of just the diff itself, due to the combination of

Fixed by only running the zed --wait <dir> logic to block until the window is closed in case the user actually passed any non-diff paths.

I've confirmed locally that it works, though I wasn't really sure how to write a good test for this.

Self-Review Checklist:

  • I've reviewed my own diff for quality, security, and reliability
  • Unsafe blocks (if any) have justifying comments
  • The content is consistent with the UI/UX checklist
  • Tests cover the new/changed behavior
  • Performance impact has been considered and is acceptable

Release Notes:

  • zed --wait --diff <left> <right> now blocks until the diff is closed, and not until the entire window is closed.

@cla-bot cla-bot Bot added the cla-signed The user has signed the Contributor License Agreement label Apr 20, 2026
@github-actions github-actions Bot added the community champion Issues filed by our amazing community champions! 🫶 label Apr 20, 2026
Copy link
Copy Markdown
Contributor

@ChristopherBiscardi ChristopherBiscardi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks :) I've verified that this works as expected

@ChristopherBiscardi ChristopherBiscardi merged commit e4d0c89 into zed-industries:main Apr 21, 2026
33 checks passed
@timvermeulen timvermeulen deleted the fix-cli-wait-diff branch April 21, 2026 02:34
@ChristopherBiscardi ChristopherBiscardi self-assigned this Apr 21, 2026
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 community champion Issues filed by our amazing community champions! 🫶

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants