buffer: Reload after undo when file changed while dirty#48698
Closed
lex00 wants to merge 1 commit intozed-industries:mainfrom
Closed
buffer: Reload after undo when file changed while dirty#48698lex00 wants to merge 1 commit intozed-industries:mainfrom
lex00 wants to merge 1 commit intozed-industries:mainfrom
Conversation
pcfreak30
added a commit
to pcfreak30/zed
that referenced
this pull request
Feb 13, 2026
Applied 5 PRs to fix Zed getting out of sync with filesystem changes: - zed-industries#48691: Include file size in DiskState to fix stale buffer reload - zed-industries#48695: Map EventKind::Other to Changed instead of None - zed-industries#48698: Reload after undo when file changed while dirty - zed-industries#48704: Rescan repositories when window regains focus - zed-industries#47462: Handle removed Linux watch paths
When a buffer is dirty and an external tool writes to the file, `file_updated()` correctly updates the file metadata but suppresses `ReloadNeeded` because the buffer has unsaved edits. If the user then undoes all edits, the buffer becomes clean but still shows the old content while the disk has newer content. Fix: in `did_edit()`, after detecting a dirty-to-clean transition, check if the file's disk mtime differs from the buffer's saved mtime. If so, emit `ReloadNeeded` to trigger a reload from disk. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
b34a7d7 to
7894576
Compare
probably-neb
added a commit
that referenced
this pull request
Mar 10, 2026
Closes #48697 Supersedes #48698 Related to #38109 ## Problem If you edit a file and an external tool writes to it while you have unsaved changes, Zed tracks the new file but skips the reload to preserve your edits. If you then undo everything, the buffer goes back to clean but still shows the old content. The disk has moved on, but nothing triggers a reload. ## Fix In `did_edit()`, when the buffer transitions from dirty to clean, check if the file's mtime changed while it was dirty. If so, emit `ReloadNeeded`. Only fires for files that still exist on disk (`DiskState::Present`). 7 lines in `crates/language/src/buffer.rs`. ### No double reload `file_updated()` suppresses `ReloadNeeded` when the buffer is dirty (that's the whole bug). So by the time `did_edit()` fires on dirty-to-clean, no prior reload was emitted for this file change. The two paths are mutually exclusive. ## Test plan - New: `test_dirty_buffer_reloads_after_undo` - No regression in `test_buffer_is_dirty` or other buffer tests - All project integration tests pass - clippy clean Release Notes: - Fixed an issue where buffer content could become stale after undoing edits when an external tool wrote to the file while the buffer was dirty. Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: Ben Kunkle <ben@zed.dev>
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
1 participant
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 #48697
Problem
If you edit a file and an external tool writes to it while you have unsaved changes, Zed tracks the new file but skips the reload to preserve your edits. If you then undo everything, the buffer goes back to clean but still shows the old content. The disk has moved on, but nothing triggers a reload.
Part of #38109. Discovered during research for #48691.
Fix
In
did_edit(), when the buffer transitions from dirty to clean, check if the file's mtime changed while it was dirty. If so, emitReloadNeeded. Only fires for files that still exist on disk (DiskState::Present).7 lines in
crates/language/src/buffer.rs.No double reload
file_updated()suppressesReloadNeededwhen the buffer is dirty (that's the whole bug). So by the timedid_edit()fires on dirty-to-clean, no prior reload was emitted for this file change. The two paths are mutually exclusive.Independent of #48691
This fix compares mtime only, which is sufficient here because the external write always produces a new mtime. The size-based fix in #48691 addresses a different scenario (same mtime, different size). The two PRs don't conflict and don't depend on each other.
Test plan
test_dirty_buffer_reloads_after_undotest_buffer_is_dirtyor other buffer testsRelease Notes: