Require save confirmation and prevent autosave for deleted files #20742
Conversation
This file contains 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
mgsloan
force-pushed
the
confirm-save-for-deleted-files
branch
2 times, most recently
from
be9b0f3 to
05fd052
Compare
This was referenced Nov 15, 2024
mgsloan
force-pushed
the
confirm-save-for-deleted-files
branch
2 times, most recently
from
58cd2b7 to
ffcbb0b
Compare
This was referenced Nov 15, 2024
mgsloan
force-pushed
the
confirm-save-for-deleted-files
branch
2 times, most recently
from
b3bd3b1 to
0355c0c
Compare
mgsloan
changed the title
* `has_conflict` will now return true if the file has been deleted on disk. This is for treating multi-buffers as conflicted, and also blocks auto-save. * `has_deleted_file` is added so that the single-file buffer save can specifically mention the delete conflict. This does not yet handle discard (#20745). Co-authored-by: Conrad <conrad@zed.dev>
mgsloan
force-pushed
the
confirm-save-for-deleted-files
branch
from
0355c0c to
a9b0175
Compare
1 task
ConradIrwin
added a commit
that referenced
this pull request
Dec 3, 2024
In #20742 we added a call to remove_item that retain an item index over an await point. This led to a race condition that could panic if another tab was removed during that time. (cc @mgsloan) This changes the API to make it harder to misuse. Release Notes: - Fixed a panic when closing tabs containing new unsaved files
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.
has_conflictwill now return true if the file has been deleted ondisk. This is for treating multi-buffers as conflicted, and also
blocks auto-save.
has_deleted_fileis added so that the single-file buffer save canspecifically mention the delete conflict. This does not yet handle
discard (Implement discarding save conflicts for externally deleted files #20745).
Closes #9101
Closes #9568
Closes #20462
Release Notes: