mirror of
https://github.com/jesseduffield/lazygit.git
synced 2024-12-14 11:23:09 +02:00
9d68b287db
When we use the one panel for the entire commit message, its tricky to have a keybinding both for adding a newline and submitting. By having two panels: one for the summary line and one for the description, we allow for 'enter' to submit the message when done from the summary panel, and 'enter' to add a newline when done from the description panel. Alt-enter, for those who can use that key combo, also works for submitting the message from the description panel. For those who can't use that key combo, and don't want to remap the keybinding, they can hit tab to go back to the summary panel and then 'enter' to submit the message. We have some awkwardness in that both contexts (i.e. panels) need to appear and disappear in tandem and we don't have a great way of handling that concept, so we just push both contexts one after the other, and likewise remove both contexts when we escape.
113 lines
3.3 KiB
Go
113 lines
3.3 KiB
Go
package context
|
|
|
|
import (
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/jesseduffield/gocui"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/types"
|
|
)
|
|
|
|
type CommitMessageContext struct {
|
|
c *ContextCommon
|
|
types.Context
|
|
viewModel *CommitMessageViewModel
|
|
}
|
|
|
|
var _ types.Context = (*CommitMessageContext)(nil)
|
|
|
|
// when selectedIndex (see below) is set to this value, it means that we're not
|
|
// currently viewing a commit message of an existing commit: instead we're making our own
|
|
// new commit message
|
|
const NoCommitIndex = -1
|
|
|
|
type CommitMessageViewModel struct {
|
|
// index of the commit message, where -1 is 'no commit', 0 is the HEAD commit, 1
|
|
// is the prior commit, and so on
|
|
selectedindex int
|
|
// if true, then upon escaping from the commit message panel, we will preserve
|
|
// the message so that it's still shown next time we open the panel
|
|
preserveMessage bool
|
|
// the full preserved message (combined summary and description)
|
|
preservedMessage string
|
|
// invoked when pressing enter in the commit message panel
|
|
onConfirm func(string) error
|
|
|
|
// The message typed in before cycling through history
|
|
// We store this separately to 'preservedMessage' because 'preservedMessage'
|
|
// is specifically for committing staged files and we don't want this affected
|
|
// by cycling through history in the context of rewording an old commit.
|
|
historyMessage string
|
|
}
|
|
|
|
func NewCommitMessageContext(
|
|
c *ContextCommon,
|
|
) *CommitMessageContext {
|
|
viewModel := &CommitMessageViewModel{}
|
|
return &CommitMessageContext{
|
|
c: c,
|
|
viewModel: viewModel,
|
|
Context: NewSimpleContext(
|
|
NewBaseContext(NewBaseContextOpts{
|
|
Kind: types.PERSISTENT_POPUP,
|
|
View: c.Views().CommitMessage,
|
|
WindowName: "commitMessage",
|
|
Key: COMMIT_MESSAGE_CONTEXT_KEY,
|
|
Focusable: true,
|
|
HasUncontrolledBounds: true,
|
|
}),
|
|
),
|
|
}
|
|
}
|
|
|
|
func (self *CommitMessageContext) SetSelectedIndex(value int) {
|
|
self.viewModel.selectedindex = value
|
|
}
|
|
|
|
func (self *CommitMessageContext) GetSelectedIndex() int {
|
|
return self.viewModel.selectedindex
|
|
}
|
|
|
|
func (self *CommitMessageContext) GetPreserveMessage() bool {
|
|
return self.viewModel.preserveMessage
|
|
}
|
|
|
|
func (self *CommitMessageContext) GetPreservedMessage() string {
|
|
return self.viewModel.preservedMessage
|
|
}
|
|
|
|
func (self *CommitMessageContext) SetPreservedMessage(message string) {
|
|
self.viewModel.preservedMessage = message
|
|
}
|
|
|
|
func (self *CommitMessageContext) GetHistoryMessage() string {
|
|
return self.viewModel.historyMessage
|
|
}
|
|
|
|
func (self *CommitMessageContext) SetHistoryMessage(message string) {
|
|
self.viewModel.historyMessage = message
|
|
}
|
|
|
|
func (self *CommitMessageContext) OnConfirm(message string) error {
|
|
return self.viewModel.onConfirm(message)
|
|
}
|
|
|
|
func (self *CommitMessageContext) SetPanelState(index int, title string, preserveMessage bool, onConfirm func(string) error) {
|
|
self.viewModel.selectedindex = index
|
|
self.viewModel.preserveMessage = preserveMessage
|
|
self.viewModel.onConfirm = onConfirm
|
|
self.GetView().Title = title
|
|
}
|
|
|
|
func (self *CommitMessageContext) RenderCommitLength() {
|
|
if !self.c.UserConfig.Gui.CommitLength.Show {
|
|
return
|
|
}
|
|
|
|
self.c.Views().CommitMessage.Subtitle = getBufferLength(self.c.Views().CommitMessage)
|
|
}
|
|
|
|
func getBufferLength(view *gocui.View) string {
|
|
return " " + strconv.Itoa(strings.Count(view.TextArea.GetContent(), "")-1) + " "
|
|
}
|