mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-04-21 12:16:54 +02:00
6c6201ab04
This fixes two problems: - each time the custom commands panel was opened, the history of commands would be shown in reversed order compared to last time. (The reason is that lo.Reverse modifies the slice in place rather than just returning a new, reversed slice.) - when executing a previous command again (either by typing it in again, or by picking it from the history), it should move to the beginning of the history, but didn't. We fix this by storing the history in reversed order (as the user sees it in the panel), this makes the logic simpler. We just have to prepend rather than append newly added commands now. While this is theoretically a breaking change, it's not worth bothering because the order was wrong for existing users in 50% of the cases anyway.
49 lines
1.4 KiB
Go
49 lines
1.4 KiB
Go
package controllers
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/types"
|
|
"github.com/jesseduffield/lazygit/pkg/utils"
|
|
"github.com/samber/lo"
|
|
)
|
|
|
|
type CustomCommandAction struct {
|
|
c *ControllerCommon
|
|
}
|
|
|
|
func (self *CustomCommandAction) Call() error {
|
|
return self.c.Prompt(types.PromptOpts{
|
|
Title: self.c.Tr.CustomCommand,
|
|
FindSuggestionsFunc: self.GetCustomCommandsHistorySuggestionsFunc(),
|
|
HandleConfirm: func(command string) error {
|
|
if self.shouldSaveCommand(command) {
|
|
self.c.GetAppState().CustomCommandsHistory = utils.Limit(
|
|
lo.Uniq(append([]string{command}, self.c.GetAppState().CustomCommandsHistory...)),
|
|
1000,
|
|
)
|
|
}
|
|
|
|
self.c.SaveAppStateAndLogError()
|
|
|
|
self.c.LogAction(self.c.Tr.Actions.CustomCommand)
|
|
return self.c.RunSubprocessAndRefresh(
|
|
self.c.OS().Cmd.NewShell(command),
|
|
)
|
|
},
|
|
})
|
|
}
|
|
|
|
func (self *CustomCommandAction) GetCustomCommandsHistorySuggestionsFunc() func(string) []*types.Suggestion {
|
|
history := self.c.GetAppState().CustomCommandsHistory
|
|
|
|
return helpers.FuzzySearchFunc(history)
|
|
}
|
|
|
|
// this mimics the shell functionality `ignorespace`
|
|
// which doesn't save a command to history if it starts with a space
|
|
func (self *CustomCommandAction) shouldSaveCommand(command string) bool {
|
|
return !strings.HasPrefix(command, " ")
|
|
}
|