From 71422a85499fdb336d37a60f0c56f236b891e2cd Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sun, 16 Jul 2023 20:34:22 +1000 Subject: [PATCH] Refresh work trees when discarding file changes We do this because we may be deleting a worktree folder so we'll need to show that in the worktrees view --- pkg/gui/controllers/files_remove_controller.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/gui/controllers/files_remove_controller.go b/pkg/gui/controllers/files_remove_controller.go index dd3a3c9c5..d595aae43 100644 --- a/pkg/gui/controllers/files_remove_controller.go +++ b/pkg/gui/controllers/files_remove_controller.go @@ -51,7 +51,7 @@ func (self *FilesRemoveController) remove(node *filetree.FileNode) error { if err := self.c.Git().WorkingTree.DiscardAllDirChanges(node); err != nil { return self.c.Error(err) } - return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES}}) + return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES, types.WORKTREES}}) }, Key: 'x', Tooltip: utils.ResolvePlaceholderString( @@ -72,7 +72,7 @@ func (self *FilesRemoveController) remove(node *filetree.FileNode) error { return self.c.Error(err) } - return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES}}) + return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES, types.WORKTREES}}) }, Key: 'u', Tooltip: utils.ResolvePlaceholderString( @@ -107,7 +107,7 @@ func (self *FilesRemoveController) remove(node *filetree.FileNode) error { if err := self.c.Git().WorkingTree.DiscardAllFileChanges(file); err != nil { return self.c.Error(err) } - return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES}}) + return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES, types.WORKTREES}}) }, Key: 'x', Tooltip: utils.ResolvePlaceholderString( @@ -128,7 +128,7 @@ func (self *FilesRemoveController) remove(node *filetree.FileNode) error { return self.c.Error(err) } - return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES}}) + return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES, types.WORKTREES}}) }, Key: 'u', Tooltip: utils.ResolvePlaceholderString(