repl: Save notebooks through the project instead of the local filesystem - #62602
Merged
MrSubidubi merged 3 commits intoAug 15, 2026
Merged
Conversation
cla-bot
Bot
added
the
cla-signed
dinocosta
added
area:repl
MrSubidubi
requested changes
Aug 14, 2026
MrSubidubi
left a comment
MrSubidubi
left a comment
Member
There was a problem hiding this comment.
Thanks for this!
Looks good overall, will give it a second pass after the comment below
Comment on lines
1852
to
1875
| fn save( | ||
| &mut self, | ||
| _options: SaveOptions, | ||
| project: Entity<Project>, | ||
| _window: &mut Window, | ||
| cx: &mut Context<Self>, | ||
| ) -> Task<Result<()>> { | ||
| let notebook = self.to_notebook(cx); | ||
| let path = self.notebook_item.read(cx).path.clone(); | ||
| let fs = project.read(cx).fs().clone(); | ||
| let project_path = self.notebook_item.read(cx).project_path.clone(); | ||
|
|
||
| self.mark_as_saved(cx); | ||
|
|
||
| cx.spawn(async move |_this, _cx| { | ||
| cx.spawn(async move |_this, cx| { | ||
| let json = | ||
| serde_json::to_string_pretty(¬ebook).context("Failed to serialize notebook")?; | ||
| fs.atomic_write(path, json).await?; | ||
| Ok(()) | ||
| let buffer = project | ||
| .update(cx, |project, cx| project.open_buffer(project_path, cx)) | ||
| .await?; | ||
| buffer.update(cx, |buffer, cx| buffer.set_text(json, cx)); | ||
| project | ||
| .update(cx, |project, cx| project.save_buffer(buffer, cx)) | ||
| .await | ||
| }) | ||
| } |
Member
There was a problem hiding this comment.
The methods save and save_as are very identical at this point, and contain a lot of duplicate code.
Can we perhaps throw this into a method save_impl that takes everything needed plus an enum that lets us differentiate between Save and SaveAs, then do all the different stuff based on that enum?
Contributor
Author
There was a problem hiding this comment.
Sure, will take a look at it.
Contributor
Author
There was a problem hiding this comment.
Done, both now go through a shared save_impl that takes a SaveDestination enum (CurrentPath / NewPath). The only branch left is save_buffer vs save_buffer_as plus the path update that has to follow the move.
Contributor
Author
|
Pushed the refactor. Tests and clippy are green locally. Ready for another look. |
MrSubidubi
reviewed
Aug 15, 2026
MrSubidubi
approved these changes
Aug 15, 2026
MrSubidubi
left a comment
MrSubidubi
left a comment
Member
There was a problem hiding this comment.
Nice, like this much more now. Good fix, good test, good PR. Thank you so much!
MrSubidubi
enabled auto-merge
August 15, 2026 19:49
playdohface
pushed a commit
to playdohface/zed
that referenced
this pull request
Aug 29, 2026
…tem (zed-industries#62602) Closes zed-industries#59001 Saving a notebook wrote the file with `project.fs().atomic_write(abs_path, ...)`. `Project::fs()` is always the client's own filesystem, so for a remote project the remote path was resolved against the local machine: on Windows the drive letter got prepended and the atomic-write temp file used a backslash, producing `C:/data/project/src_example\.tmpPuzw3d3` and `os error 3`. The same thing fails on macOS/Linux clients with `os error 2`. Both `save` and `save_as` now go through the project's buffer machinery instead: open the buffer for the notebook's `ProjectPath`, set its text to the serialized notebook, then `save_buffer` / `save_buffer_as`. Writes are routed over the remote connection for remote projects, and the open buffer stays in sync locally. `save_as` also updates the item's project path and entry id, since `save_buffer_as` moves the buffer to the new path and otherwise the next save would write back to the old file. Added a test that edits a cell, saves, and checks that the notebook buffer held by the project reflects the saved file. It fails against the old implementation. Release Notes: - N/A --------- Co-authored-by: Finn Evers <finn.evers@outlook.de>
sergiooroman
pushed a commit
to sergiooroman/zed
that referenced
this pull request
Sep 8, 2026
…tem (zed-industries#62602) Closes zed-industries#59001 Saving a notebook wrote the file with `project.fs().atomic_write(abs_path, ...)`. `Project::fs()` is always the client's own filesystem, so for a remote project the remote path was resolved against the local machine: on Windows the drive letter got prepended and the atomic-write temp file used a backslash, producing `C:/data/project/src_example\.tmpPuzw3d3` and `os error 3`. The same thing fails on macOS/Linux clients with `os error 2`. Both `save` and `save_as` now go through the project's buffer machinery instead: open the buffer for the notebook's `ProjectPath`, set its text to the serialized notebook, then `save_buffer` / `save_buffer_as`. Writes are routed over the remote connection for remote projects, and the open buffer stays in sync locally. `save_as` also updates the item's project path and entry id, since `save_buffer_as` moves the buffer to the new path and otherwise the next save would write back to the old file. Added a test that edits a cell, saves, and checks that the notebook buffer held by the project reflects the saved file. It fails against the old implementation. Release Notes: - N/A --------- Co-authored-by: Finn Evers <finn.evers@outlook.de>
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
3 participants
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.
Closes #59001
Saving a notebook wrote the file with
project.fs().atomic_write(abs_path, ...).Project::fs()is always the client's own filesystem, so for a remote project the remote path was resolved against the local machine: on Windows the drive letter got prepended and the atomic-write temp file used a backslash, producingC:/data/project/src_example\.tmpPuzw3d3andos error 3. The same thing fails on macOS/Linux clients withos error 2.Both
saveandsave_asnow go through the project's buffer machinery instead: open the buffer for the notebook'sProjectPath, set its text to the serialized notebook, thensave_buffer/save_buffer_as. Writes are routed over the remote connection for remote projects, and the open buffer stays in sync locally.save_asalso updates the item's project path and entry id, sincesave_buffer_asmoves the buffer to the new path and otherwise the next save would write back to the old file.Added a test that edits a cell, saves, and checks that the notebook buffer held by the project reflects the saved file. It fails against the old implementation.
Release Notes: