cli: Make zed --wait --diff not wait until window close#54367
Merged
ChristopherBiscardi merged 1 commit intozed-industries:mainfrom Apr 21, 2026
Merged
cli: Make zed --wait --diff not wait until window close#54367ChristopherBiscardi merged 1 commit intozed-industries:mainfrom
zed --wait --diff not wait until window close#54367ChristopherBiscardi merged 1 commit intozed-industries:mainfrom
Conversation
ChristopherBiscardi
approved these changes
Apr 21, 2026
Contributor
ChristopherBiscardi
left a comment
There was a problem hiding this comment.
Thanks :) I've verified that this works as expected
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
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.
zed --wait --diff <left> <right>currently waits for the entire window to close instead of just the diff itself, due to the combination ofzed --diffadds the cwd to the paths to open (see cli: Teach--diffto recurse into directories and add aMultiDiffView#45131), andzed --waitblocks until the Zed window is closed (see Make zed --wait work with directories #44936), which doesn't distinguish between explicit paths and the onezed --diffaddsFixed 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:
Release Notes:
zed --wait --diff <left> <right>now blocks until the diff is closed, and not until the entire window is closed.