mirror of
https://github.com/jesseduffield/lazygit.git
synced 2024-12-14 11:23:09 +02:00
49da7b482d
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.
293 lines
9.3 KiB
Go
293 lines
9.3 KiB
Go
package gui
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/gui/context"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/types"
|
|
)
|
|
|
|
func (gui *Gui) contextTree() *context.ContextTree {
|
|
return &context.ContextTree{
|
|
Global: context.NewSimpleContext(
|
|
context.NewBaseContext(context.NewBaseContextOpts{
|
|
Kind: types.GLOBAL_CONTEXT,
|
|
View: nil, // TODO: see if this breaks anything
|
|
WindowName: "",
|
|
Key: context.GLOBAL_CONTEXT_KEY,
|
|
Focusable: false,
|
|
HasUncontrolledBounds: true, // setting to true because the global context doesn't even have a view
|
|
}),
|
|
context.ContextCallbackOpts{
|
|
OnRenderToMain: gui.statusRenderToMain,
|
|
},
|
|
),
|
|
Status: context.NewSimpleContext(
|
|
context.NewBaseContext(context.NewBaseContextOpts{
|
|
Kind: types.SIDE_CONTEXT,
|
|
View: gui.Views.Status,
|
|
WindowName: "status",
|
|
Key: context.STATUS_CONTEXT_KEY,
|
|
Focusable: true,
|
|
}),
|
|
context.ContextCallbackOpts{
|
|
OnRenderToMain: gui.statusRenderToMain,
|
|
},
|
|
),
|
|
Snake: context.NewSimpleContext(
|
|
context.NewBaseContext(context.NewBaseContextOpts{
|
|
Kind: types.SIDE_CONTEXT,
|
|
View: gui.Views.Snake,
|
|
WindowName: "files",
|
|
Key: context.SNAKE_CONTEXT_KEY,
|
|
Focusable: true,
|
|
}),
|
|
context.ContextCallbackOpts{
|
|
OnFocus: func(opts types.OnFocusOpts) error {
|
|
gui.startSnake()
|
|
return nil
|
|
},
|
|
OnFocusLost: func(opts types.OnFocusLostOpts) error {
|
|
gui.snakeGame.Exit()
|
|
gui.moveToTopOfWindow(gui.State.Contexts.Submodules)
|
|
return nil
|
|
},
|
|
},
|
|
),
|
|
Files: gui.filesListContext(),
|
|
Submodules: gui.submodulesListContext(),
|
|
Menu: gui.menuListContext(),
|
|
Remotes: gui.remotesListContext(),
|
|
RemoteBranches: gui.remoteBranchesListContext(),
|
|
LocalCommits: gui.branchCommitsListContext(),
|
|
CommitFiles: gui.commitFilesListContext(),
|
|
ReflogCommits: gui.reflogCommitsListContext(),
|
|
SubCommits: gui.subCommitsListContext(),
|
|
Branches: gui.branchesListContext(),
|
|
Tags: gui.tagsListContext(),
|
|
Stash: gui.stashListContext(),
|
|
Suggestions: gui.suggestionsListContext(),
|
|
Normal: context.NewSimpleContext(
|
|
context.NewBaseContext(context.NewBaseContextOpts{
|
|
Kind: types.MAIN_CONTEXT,
|
|
View: gui.Views.Main,
|
|
WindowName: "main",
|
|
Key: context.NORMAL_MAIN_CONTEXT_KEY,
|
|
Focusable: false,
|
|
}),
|
|
context.ContextCallbackOpts{
|
|
OnFocus: func(opts types.OnFocusOpts) error {
|
|
return nil // TODO: should we do something here? We should allow for scrolling the panel
|
|
},
|
|
},
|
|
),
|
|
NormalSecondary: context.NewSimpleContext(
|
|
context.NewBaseContext(context.NewBaseContextOpts{
|
|
Kind: types.MAIN_CONTEXT,
|
|
View: gui.Views.Secondary,
|
|
WindowName: "secondary",
|
|
Key: context.NORMAL_SECONDARY_CONTEXT_KEY,
|
|
Focusable: false,
|
|
}),
|
|
context.ContextCallbackOpts{},
|
|
),
|
|
Staging: context.NewPatchExplorerContext(
|
|
gui.Views.Staging,
|
|
"main",
|
|
context.STAGING_MAIN_CONTEXT_KEY,
|
|
func(opts types.OnFocusOpts) error {
|
|
gui.Views.Staging.Wrap = false
|
|
gui.Views.StagingSecondary.Wrap = false
|
|
|
|
return gui.refreshStagingPanel(opts)
|
|
},
|
|
func(opts types.OnFocusLostOpts) error {
|
|
gui.State.Contexts.Staging.SetState(nil)
|
|
|
|
if opts.NewContextKey != context.STAGING_SECONDARY_CONTEXT_KEY {
|
|
gui.Views.Staging.Wrap = true
|
|
gui.Views.StagingSecondary.Wrap = true
|
|
_ = gui.State.Contexts.Staging.Render(false)
|
|
_ = gui.State.Contexts.StagingSecondary.Render(false)
|
|
}
|
|
return nil
|
|
},
|
|
func() []int { return nil },
|
|
gui.c,
|
|
),
|
|
StagingSecondary: context.NewPatchExplorerContext(
|
|
gui.Views.StagingSecondary,
|
|
"secondary",
|
|
context.STAGING_SECONDARY_CONTEXT_KEY,
|
|
func(opts types.OnFocusOpts) error {
|
|
gui.Views.Staging.Wrap = false
|
|
gui.Views.StagingSecondary.Wrap = false
|
|
|
|
return gui.refreshStagingPanel(opts)
|
|
},
|
|
func(opts types.OnFocusLostOpts) error {
|
|
gui.State.Contexts.StagingSecondary.SetState(nil)
|
|
|
|
if opts.NewContextKey != context.STAGING_MAIN_CONTEXT_KEY {
|
|
gui.Views.Staging.Wrap = true
|
|
gui.Views.StagingSecondary.Wrap = true
|
|
_ = gui.State.Contexts.Staging.Render(false)
|
|
_ = gui.State.Contexts.StagingSecondary.Render(false)
|
|
}
|
|
return nil
|
|
},
|
|
func() []int { return nil },
|
|
gui.c,
|
|
),
|
|
CustomPatchBuilder: context.NewPatchExplorerContext(
|
|
gui.Views.PatchBuilding,
|
|
"main",
|
|
context.PATCH_BUILDING_MAIN_CONTEXT_KEY,
|
|
func(opts types.OnFocusOpts) error {
|
|
// no need to change wrap on the secondary view because it can't be interacted with
|
|
gui.Views.PatchBuilding.Wrap = false
|
|
|
|
return gui.refreshPatchBuildingPanel(opts)
|
|
},
|
|
func(opts types.OnFocusLostOpts) error {
|
|
gui.Views.PatchBuilding.Wrap = true
|
|
|
|
if gui.git.Patch.PatchBuilder.IsEmpty() {
|
|
gui.git.Patch.PatchBuilder.Reset()
|
|
}
|
|
|
|
return nil
|
|
},
|
|
func() []int {
|
|
filename := gui.State.Contexts.CommitFiles.GetSelectedPath()
|
|
includedLineIndices, err := gui.git.Patch.PatchBuilder.GetFileIncLineIndices(filename)
|
|
if err != nil {
|
|
gui.Log.Error(err)
|
|
return nil
|
|
}
|
|
|
|
return includedLineIndices
|
|
},
|
|
gui.c,
|
|
),
|
|
CustomPatchBuilderSecondary: context.NewSimpleContext(
|
|
context.NewBaseContext(context.NewBaseContextOpts{
|
|
Kind: types.MAIN_CONTEXT,
|
|
View: gui.Views.PatchBuildingSecondary,
|
|
WindowName: "secondary",
|
|
Key: context.PATCH_BUILDING_SECONDARY_CONTEXT_KEY,
|
|
Focusable: false,
|
|
}),
|
|
context.ContextCallbackOpts{},
|
|
),
|
|
MergeConflicts: context.NewMergeConflictsContext(
|
|
gui.Views.MergeConflicts,
|
|
context.ContextCallbackOpts{
|
|
OnFocus: OnFocusWrapper(func() error {
|
|
gui.Views.MergeConflicts.Wrap = false
|
|
|
|
return gui.refreshMergePanel(true)
|
|
}),
|
|
OnFocusLost: func(opts types.OnFocusLostOpts) error {
|
|
gui.State.Contexts.MergeConflicts.SetUserScrolling(false)
|
|
gui.State.Contexts.MergeConflicts.GetState().ResetConflictSelection()
|
|
gui.Views.MergeConflicts.Wrap = true
|
|
|
|
return nil
|
|
},
|
|
},
|
|
gui.c,
|
|
func() map[string]string {
|
|
// wrapping in a function because contexts are initialized before helpers
|
|
return gui.helpers.MergeConflicts.GetMergingOptions()
|
|
},
|
|
),
|
|
Confirmation: context.NewSimpleContext(
|
|
context.NewBaseContext(context.NewBaseContextOpts{
|
|
Kind: types.TEMPORARY_POPUP,
|
|
View: gui.Views.Confirmation,
|
|
WindowName: "confirmation",
|
|
Key: context.CONFIRMATION_CONTEXT_KEY,
|
|
Focusable: true,
|
|
HasUncontrolledBounds: true,
|
|
}),
|
|
context.ContextCallbackOpts{
|
|
OnFocus: OnFocusWrapper(gui.handleAskFocused),
|
|
OnFocusLost: func(types.OnFocusLostOpts) error {
|
|
gui.deactivateConfirmationPrompt()
|
|
return nil
|
|
},
|
|
},
|
|
),
|
|
CommitMessage: context.NewCommitMessageContext(
|
|
gui.Views.CommitMessage,
|
|
context.ContextCallbackOpts{
|
|
OnFocus: OnFocusWrapper(gui.handleCommitMessageFocused),
|
|
},
|
|
),
|
|
CommitDescription: context.NewSimpleContext(
|
|
context.NewBaseContext(context.NewBaseContextOpts{
|
|
Kind: types.PERSISTENT_POPUP,
|
|
View: gui.Views.CommitDescription,
|
|
WindowName: "commitDescription",
|
|
Key: context.COMMIT_DESCRIPTION_CONTEXT_KEY,
|
|
Focusable: true,
|
|
HasUncontrolledBounds: true,
|
|
}),
|
|
context.ContextCallbackOpts{
|
|
OnFocus: func(opts types.OnFocusOpts) error {
|
|
_, err := gui.g.SetViewBeneath("commitDescription", "commitMessage", 10)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
},
|
|
},
|
|
),
|
|
Search: context.NewSimpleContext(
|
|
context.NewBaseContext(context.NewBaseContextOpts{
|
|
Kind: types.PERSISTENT_POPUP,
|
|
View: gui.Views.Search,
|
|
WindowName: "search",
|
|
Key: context.SEARCH_CONTEXT_KEY,
|
|
Focusable: true,
|
|
}),
|
|
context.ContextCallbackOpts{},
|
|
),
|
|
CommandLog: context.NewSimpleContext(
|
|
context.NewBaseContext(context.NewBaseContextOpts{
|
|
Kind: types.EXTRAS_CONTEXT,
|
|
View: gui.Views.Extras,
|
|
WindowName: "extras",
|
|
Key: context.COMMAND_LOG_CONTEXT_KEY,
|
|
Focusable: true,
|
|
}),
|
|
context.ContextCallbackOpts{
|
|
OnFocusLost: func(opts types.OnFocusLostOpts) error {
|
|
gui.Views.Extras.Autoscroll = true
|
|
return nil
|
|
},
|
|
},
|
|
),
|
|
Options: context.NewDisplayContext(context.OPTIONS_CONTEXT_KEY, gui.Views.Options, "options"),
|
|
AppStatus: context.NewDisplayContext(context.APP_STATUS_CONTEXT_KEY, gui.Views.AppStatus, "appStatus"),
|
|
SearchPrefix: context.NewDisplayContext(context.SEARCH_PREFIX_CONTEXT_KEY, gui.Views.SearchPrefix, "searchPrefix"),
|
|
Information: context.NewDisplayContext(context.INFORMATION_CONTEXT_KEY, gui.Views.Information, "information"),
|
|
Limit: context.NewDisplayContext(context.LIMIT_CONTEXT_KEY, gui.Views.Limit, "limit"),
|
|
}
|
|
}
|
|
|
|
// using this wrapper for when an onFocus function doesn't care about any potential
|
|
// props that could be passed
|
|
func OnFocusWrapper(f func() error) func(opts types.OnFocusOpts) error {
|
|
return func(opts types.OnFocusOpts) error {
|
|
return f()
|
|
}
|
|
}
|
|
|
|
func (gui *Gui) getPatchExplorerContexts() []types.IPatchExplorerContext {
|
|
return []types.IPatchExplorerContext{
|
|
gui.State.Contexts.Staging,
|
|
gui.State.Contexts.StagingSecondary,
|
|
gui.State.Contexts.CustomPatchBuilder,
|
|
}
|
|
}
|