Add ability to reload a file

[schpet]

Closes #13212

Release Notes:

• Added reload command
• vim: Added :e[dit], :e[dit]! which calls reload

[cla-bot]

We require contributors to sign our Contributor License Agreement, and we don't have @schpet on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'.

[ConradIrwin]

@schpet Thanks for this!

We have the code to reload already - for when you click "Discard" in the case of conflict on save (

zed/crates/editor/src/items.rs

Line 788 in c83d007

fn reload(&mut self, project: Model<Project>, cx: &mut ViewContext<Self>) -> Task<Result<()>> {

).

This will ensure it also works for remote projects and should resolve the file status (though I'm less sure how well it deals with cursor position, as it's currently only called when an alert is open :D).

To make it work for vim, you can add it to the commands here:

zed/crates/vim/src/command.rs

Line 434 in c83d007

("w", "rite"),

[schpet]

looking for suggestions on how to handle this. in vim, :edit will not throw away your changes, but :edit! will. to quote https://vimhelp.org/editing.txt.html#:edit

:e[dit] [++opt] [+cmd]	Edit the current file.  This is useful to re-edit the
			current file, when it has been changed outside of Vim.
			This fails when changes have been made to the current
			buffer and 'autowriteall' isn't set or the file can't
			be written.
			Also see ++opt and +cmd.

							:edit! discard
:e[dit]! [++opt] [+cmd]
			Edit the current file always.  Discard any changes to
			the current buffer.  This is useful if you want to
			start all over again.
			Also see ++opt and +cmd.

							:edit_f

i don't think i ever run :e without any arguments in vim, always :e!, is there a way to only map :e! :edit! in zed? or will that require changes to VimCommand ?

[ConradIrwin]

We can either keep them the same (as you have done), and improve it later; or we could add another action that is just a no-op. I think it'd be better to keep them the same (until we add argument support and we get another try).

[schpet]

i'm going to attempt to figure this out but if someone happens to look at this and knows what i need to do to call the existing reload function i'm interested in learning (i don't know rust very well at all)

[ConradIrwin]

You should just be able to call self.reload() in your action callback. Does that not work?

[schpet]

oh! thanks. c3a72e1 attempts to do that. i am curious if

• is Item as WorkspaceItem legit?
• is let _ = self.reload(project, cx); legit or should i try to do something with the result

[schpet]

oh: also wondering if project.clone() makes sense

[ConradIrwin]

You probably need the clone to keep the borrow checker happy (= may not do what you might expect in rust https://cirw.in/blog/rust-assignment).

With the result you should be able to call .notify_err() on the result to have it show up:

 pub fn reload_file(&mut self, _: &ReloadFile, cx: &mut ViewContext<Self>) {
        let Some(workspace) = self.workspace() else {
           return;
        }
        let Some(project) = self.project.clone() else {
            return;
        }
        self.reload(project, cx).notify_err(workspace, cx)
    }

(though I haven't tried running it).

[schpet]

huh! really appreciate the link and the post.

landed on 1b1a690 - self.reload(project, cx).detach_and_notify_err(cx);

[schpet]

@cla-bot check

[cla-bot]

The cla-bot has been summoned, and re-checked this pull request!

[alexanderjeurissen]

@schpet Great work on the PR, what is blocking us from shipping this ? how can we move this along ?

[schpet]

@alexanderjeurissen thanks! i'm waiting for the original reviewer to get back from a trip before following up with them. otherwise this just needs a set of discerning eyes and access to the merge button.

[ConradIrwin]

Thanks for this, and sorry for not hitting merge before disappearing for two weeks!