sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-31 14:24:25 +03:00
Code Activity

Clear keybinding functions in resetHelpersAndControllers

Browse Source 
When switching to a repo that was open before, the context tree is reused, so
before adding keybinding functions to those contexts again, we need to clear the
old ones.
This commit is contained in:
Stefan Haller
2024-06-13 10:01:35 +02:00
parent a7c97400c6
commit cf27fd827b
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/gui/context/base_context.go
View File

@ -133,6 +133,11 @@ func (self *BaseContext) AddMouseKeybindingsFn(fn types.MouseKeybindingsFn) {
self.mouseKeybindingsFns = append(self.mouseKeybindingsFns, fn) self.mouseKeybindingsFns = append(self.mouseKeybindingsFns, fn)
} }
func (self *BaseContext) ClearAllBindingsFn() {
self.keybindingsFns = []types.KeybindingsFn{}
self.mouseKeybindingsFns = []types.MouseKeybindingsFn{}
}
func (self *BaseContext) AddOnClickFn(fn func() error) { func (self *BaseContext) AddOnClickFn(fn func() error) {
if fn != nil { if fn != nil {
self.onClickFn = fn self.onClickFn = fn

4
pkg/gui/controllers.go
View File

@ -20,6 +20,10 @@ func (gui *Gui) Helpers() *helpers.Helpers {
// in the keybinding menu: the earlier that the controller is attached to a context, // in the keybinding menu: the earlier that the controller is attached to a context,
// the lower in the list the keybindings will appear. // the lower in the list the keybindings will appear.
func (gui *Gui) resetHelpersAndControllers() { func (gui *Gui) resetHelpersAndControllers() {
for _, context := range gui.Contexts().Flatten() {
context.ClearAllBindingsFn()
}
helperCommon := gui.c helperCommon := gui.c
recordDirectoryHelper := helpers.NewRecordDirectoryHelper(helperCommon) recordDirectoryHelper := helpers.NewRecordDirectoryHelper(helperCommon)
reposHelper := helpers.NewRecentReposHelper(helperCommon, recordDirectoryHelper, gui.onNewRepo) reposHelper := helpers.NewRecentReposHelper(helperCommon, recordDirectoryHelper, gui.onNewRepo)

1
pkg/gui/types/context.go
View File

@ -74,6 +74,7 @@ type IBaseContext interface {
AddKeybindingsFn(KeybindingsFn) AddKeybindingsFn(KeybindingsFn)
AddMouseKeybindingsFn(MouseKeybindingsFn) AddMouseKeybindingsFn(MouseKeybindingsFn)
ClearAllBindingsFn()
// This is a bit of a hack at the moment: we currently only set an onclick function so that // This is a bit of a hack at the moment: we currently only set an onclick function so that
// our list controller can come along and wrap it in a list-specific click handler. // our list controller can come along and wrap it in a list-specific click handler.

3
pkg/integration/tests/ui/keybinding_suggestions_when_switching_repos.go
View File

@ -37,9 +37,6 @@ var KeybindingSuggestionsWhenSwitchingRepos = NewIntegrationTest(NewIntegrationT
switchToRepo("repo") switchToRepo("repo")
t.Views().Options().Content( t.Views().Options().Content(
/* EXPECTED:
Equals("Commit: c | Stash: s | Reset: D | Keybindings: ? | Cancel: <esc>")) Equals("Commit: c | Stash: s | Reset: D | Keybindings: ? | Cancel: <esc>"))
ACTUAL (all keybindings appear twice): */
Equals("Commit: c | Stash: s | Reset: D | Commit: c | Stash: s | Reset: D | Keybindings: ? | Cancel: <esc> | Keybindings: ? | Cancel: <esc>"))
}, },
}) })