ComputerSurge/lazygit
3
0
Fork 0
Code Pull Requests 1 Activity

Support custom keybindings for confirm discard

Browse Source
This commit is contained in:
Mark Skelton
2023-08-25 08:50:05 -05:00
parent a670fbb33c
commit 6dc34d19ea
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/config/user_config.go
View File

@@ -223,6 +223,7 @@ type KeybindingFilesConfig struct {
CommitChangesWithoutHook string `yaml:"commitChangesWithoutHook"` CommitChangesWithoutHook string `yaml:"commitChangesWithoutHook"`
AmendLastCommit string `yaml:"amendLastCommit"` AmendLastCommit string `yaml:"amendLastCommit"`
CommitChangesWithEditor string `yaml:"commitChangesWithEditor"` CommitChangesWithEditor string `yaml:"commitChangesWithEditor"`
ConfirmDiscard string `yaml:"confirmDiscard"`
IgnoreFile string `yaml:"ignoreFile"` IgnoreFile string `yaml:"ignoreFile"`
RefreshFiles string `yaml:"refreshFiles"` RefreshFiles string `yaml:"refreshFiles"`
StashAllChanges string `yaml:"stashAllChanges"` StashAllChanges string `yaml:"stashAllChanges"`
@@ -592,6 +593,7 @@ func GetDefaultConfig() *UserConfig {
ToggleTreeView: "`", ToggleTreeView: "`",
OpenMergeTool: "M", OpenMergeTool: "M",
OpenStatusFilter: "<c-b>", OpenStatusFilter: "<c-b>",
ConfirmDiscard: "x",
}, },
Branches: KeybindingBranchesConfig{ Branches: KeybindingBranchesConfig{
CopyPullRequestURL: "<c-y>", CopyPullRequestURL: "<c-y>",

4
pkg/gui/controllers/files_remove_controller.go
View File

@@ -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}}) 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( Tooltip: utils.ResolvePlaceholderString(
self.c.Tr.DiscardAllTooltip, self.c.Tr.DiscardAllTooltip,
map[string]string{ 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}}) 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( Tooltip: utils.ResolvePlaceholderString(
self.c.Tr.DiscardAllTooltip, self.c.Tr.DiscardAllTooltip,
map[string]string{ map[string]string{