From 6dc34d19ea4f8ff6dd42e688c48fee7c77ba82e8 Mon Sep 17 00:00:00 2001
From: Mark Skelton <mark@federato.ai>
Date: Fri, 25 Aug 2023 08:50:05 -0500
Subject: [PATCH] Support custom keybindings for confirm discard

---
 pkg/config/user_config.go                      | 2 ++
 pkg/gui/controllers/files_remove_controller.go | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkg/config/user_config.go b/pkg/config/user_config.go
index 09631374f..43bbe05ee 100644
--- a/pkg/config/user_config.go
+++ b/pkg/config/user_config.go
@@ -223,6 +223,7 @@ type KeybindingFilesConfig struct {
 	CommitChangesWithoutHook string `yaml:"commitChangesWithoutHook"`
 	AmendLastCommit          string `yaml:"amendLastCommit"`
 	CommitChangesWithEditor  string `yaml:"commitChangesWithEditor"`
+	ConfirmDiscard           string `yaml:"confirmDiscard"`
 	IgnoreFile               string `yaml:"ignoreFile"`
 	RefreshFiles             string `yaml:"refreshFiles"`
 	StashAllChanges          string `yaml:"stashAllChanges"`
@@ -592,6 +593,7 @@ func GetDefaultConfig() *UserConfig {
 				ToggleTreeView:           "`",
 				OpenMergeTool:            "M",
 				OpenStatusFilter:         "<c-b>",
+				ConfirmDiscard:           "x",
 			},
 			Branches: KeybindingBranchesConfig{
 				CopyPullRequestURL:     "<c-y>",
diff --git a/pkg/gui/controllers/files_remove_controller.go b/pkg/gui/controllers/files_remove_controller.go
index d595aae43..2afa6e5a8 100644
--- a/pkg/gui/controllers/files_remove_controller.go
+++ b/pkg/gui/controllers/files_remove_controller.go
@@ -53,7 +53,7 @@ func (self *FilesRemoveController) remove(node *filetree.FileNode) error {
 					}
 					return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES, types.WORKTREES}})
 				},
-				Key: 'x',
+				Key: self.c.KeybindingsOpts().GetKey(self.c.UserConfig.Keybinding.Files.ConfirmDiscard),
 				Tooltip: utils.ResolvePlaceholderString(
 					self.c.Tr.DiscardAllTooltip,
 					map[string]string{
@@ -109,7 +109,7 @@ func (self *FilesRemoveController) remove(node *filetree.FileNode) error {
 						}
 						return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC, Scope: []types.RefreshableView{types.FILES, types.WORKTREES}})
 					},
-					Key: 'x',
+					Key: self.c.KeybindingsOpts().GetKey(self.c.UserConfig.Keybinding.Files.ConfirmDiscard),
 					Tooltip: utils.ResolvePlaceholderString(
 						self.c.Tr.DiscardAllTooltip,
 						map[string]string{