go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-01-04 03:48:07 +02:00
Code Issues Releases Activity

remove context callback opts

Browse Source
This commit is contained in:
Jesse Duffield 2023-03-21 21:01:58 +11:00
parent 509e3efa70
commit e2db6a1732
19 changed files with 16 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/gui/context/branches_context.go
View File

@ -34,7 +34,7 @@ func NewBranchesContext(
Key: LOCAL_BRANCHES_CONTEXT_KEY,
Kind: types.SIDE_CONTEXT,
Focusable: true,
}), ContextCallbackOpts{}),
})),
list: viewModel,
getDisplayStrings: getDisplayStrings,
c: c,

2
pkg/gui/context/commit_files_context.go
View File

@ -40,7 +40,7 @@ func NewCommitFilesContext(
Focusable: true,
Transient: true,
}),
ContextCallbackOpts{}),
),
list: viewModel,
getDisplayStrings: getDisplayStrings,
c: c,

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

@ -29,7 +29,6 @@ func NewCommitMessageContext(
Focusable: true,
HasUncontrolledBounds: true,
}),
ContextCallbackOpts{},
),
}
}

2
pkg/gui/context/confirmation_context.go
View File

@ -30,6 +30,6 @@ func NewConfirmationContext(
Kind: types.TEMPORARY_POPUP,
Focusable: true,
HasUncontrolledBounds: true,
}), ContextCallbackOpts{}),
})),
}
}

2
pkg/gui/context/local_commits_context.go
View File

@ -35,7 +35,7 @@ func NewLocalCommitsContext(
Key: LOCAL_COMMITS_CONTEXT_KEY,
Kind: types.SIDE_CONTEXT,
Focusable: true,
}), ContextCallbackOpts{}),
})),
list: viewModel,
getDisplayStrings: getDisplayStrings,
c: c,

2
pkg/gui/context/menu_context.go
View File

@ -29,7 +29,7 @@ func NewMenuContext(
Kind: types.TEMPORARY_POPUP,
Focusable: true,
HasUncontrolledBounds: true,
}), ContextCallbackOpts{}),
})),
getDisplayStrings: viewModel.GetDisplayStrings,
list: viewModel,
c: c,

3
pkg/gui/context/merge_conflicts_context.go
View File

@ -27,8 +27,6 @@ type ConflictsViewModel struct {
func NewMergeConflictsContext(
view *gocui.View,
opts ContextCallbackOpts,
c *types.HelperCommon,
) *MergeConflictsContext {
viewModel := &ConflictsViewModel{
@ -48,7 +46,6 @@ func NewMergeConflictsContext(
Focusable: true,
HighlightOnFocus: true,
}),
opts,
),
c: c,
}

2
pkg/gui/context/patch_explorer_context.go
View File

@ -41,7 +41,7 @@ func NewPatchExplorerContext(
Kind: types.MAIN_CONTEXT,
Focusable: true,
HighlightOnFocus: true,
}), ContextCallbackOpts{}),
})),
}
}

2
pkg/gui/context/reflog_commits_context.go
View File

@ -34,7 +34,7 @@ func NewReflogCommitsContext(
Key: REFLOG_COMMITS_CONTEXT_KEY,
Kind: types.SIDE_CONTEXT,
Focusable: true,
}), ContextCallbackOpts{}),
})),
list: viewModel,
getDisplayStrings: getDisplayStrings,
c: c,

2
pkg/gui/context/remote_branches_context.go
View File

@ -37,7 +37,7 @@ func NewRemoteBranchesContext(
Kind: types.SIDE_CONTEXT,
Focusable: true,
Transient: true,
}), ContextCallbackOpts{}),
})),
list: viewModel,
getDisplayStrings: getDisplayStrings,
c: c,

2
pkg/gui/context/remotes_context.go
View File

@ -34,7 +34,7 @@ func NewRemotesContext(
Key: REMOTES_CONTEXT_KEY,
Kind: types.SIDE_CONTEXT,
Focusable: true,
}), ContextCallbackOpts{}),
})),
list: viewModel,
getDisplayStrings: getDisplayStrings,
c: c,

13
pkg/gui/context/simple_context.go
View File

@ -6,18 +6,11 @@ import (
)
type SimpleContext struct {
OnRender func() error
*BaseContext
}
type ContextCallbackOpts struct {
OnRender func() error
}
func NewSimpleContext(baseContext *BaseContext, opts ContextCallbackOpts) *SimpleContext {
func NewSimpleContext(baseContext *BaseContext) *SimpleContext {
return &SimpleContext{
OnRender: opts.OnRender,
BaseContext: baseContext,
}
}
@ -35,7 +28,6 @@ func NewDisplayContext(key types.ContextKey, view *gocui.View, windowName string
Focusable: false,
Transient: false,
}),
ContextCallbackOpts{},
)
}
@ -67,9 +59,6 @@ func (self *SimpleContext) HandleFocusLost(opts types.OnFocusLostOpts) error {
}
func (self *SimpleContext) HandleRender() error {
if self.OnRender != nil {
return self.OnRender()
}
return nil
}

2
pkg/gui/context/stash_context.go
View File

@ -34,7 +34,7 @@ func NewStashContext(
Key: STASH_CONTEXT_KEY,
Kind: types.SIDE_CONTEXT,
Focusable: true,
}), ContextCallbackOpts{}),
})),
list: viewModel,
getDisplayStrings: getDisplayStrings,
c: c,

2
pkg/gui/context/sub_commits_context.go
View File

@ -45,7 +45,7 @@ func NewSubCommitsContext(
Kind: types.SIDE_CONTEXT,
Focusable: true,
Transient: true,
}), ContextCallbackOpts{}),
})),
list: viewModel,
getDisplayStrings: getDisplayStrings,
c: c,

2
pkg/gui/context/submodules_context.go
View File

@ -31,7 +31,7 @@ func NewSubmodulesContext(
Key: SUBMODULES_CONTEXT_KEY,
Kind: types.SIDE_CONTEXT,
Focusable: true,
}), ContextCallbackOpts{}),
})),
list: viewModel,
getDisplayStrings: getDisplayStrings,
c: c,

2
pkg/gui/context/suggestions_context.go
View File

@ -53,7 +53,7 @@ func NewSuggestionsContext(
Kind: types.PERSISTENT_POPUP,
Focusable: true,
HasUncontrolledBounds: true,
}), ContextCallbackOpts{}),
})),
list: viewModel,
getDisplayStrings: getDisplayStrings,
c: c,

2
pkg/gui/context/tags_context.go
View File

@ -34,7 +34,7 @@ func NewTagsContext(
Key: TAGS_CONTEXT_KEY,
Kind: types.SIDE_CONTEXT,
Focusable: true,
}), ContextCallbackOpts{}),
})),
list: viewModel,
getDisplayStrings: getDisplayStrings,
c: c,

2
pkg/gui/context/working_tree_context.go
View File

@ -32,7 +32,7 @@ func NewWorkingTreeContext(
Key: FILES_CONTEXT_KEY,
Kind: types.SIDE_CONTEXT,
Focusable: true,
}), ContextCallbackOpts{}),
})),
list: viewModel,
getDisplayStrings: getDisplayStrings,
c: c,

9
pkg/gui/context_config.go
View File

@ -17,7 +17,6 @@ func (gui *Gui) contextTree() *context.ContextTree {
Focusable: false,
HasUncontrolledBounds: true, // setting to true because the global context doesn't even have a view
}),
context.ContextCallbackOpts{},
),
Status: context.NewSimpleContext(
context.NewBaseContext(context.NewBaseContextOpts{
@ -27,7 +26,6 @@ func (gui *Gui) contextTree() *context.ContextTree {
Key: context.STATUS_CONTEXT_KEY,
Focusable: true,
}),
context.ContextCallbackOpts{},
),
Snake: context.NewSimpleContext(
context.NewBaseContext(context.NewBaseContextOpts{
@ -37,7 +35,6 @@ func (gui *Gui) contextTree() *context.ContextTree {
Key: context.SNAKE_CONTEXT_KEY,
Focusable: true,
}),
context.ContextCallbackOpts{},
),
Files: gui.filesListContext(),
Submodules: gui.submodulesListContext(),
@ -60,7 +57,6 @@ func (gui *Gui) contextTree() *context.ContextTree {
Key: context.NORMAL_MAIN_CONTEXT_KEY,
Focusable: false,
}),
context.ContextCallbackOpts{},
),
NormalSecondary: context.NewSimpleContext(
context.NewBaseContext(context.NewBaseContextOpts{
@ -70,7 +66,6 @@ func (gui *Gui) contextTree() *context.ContextTree {
Key: context.NORMAL_SECONDARY_CONTEXT_KEY,
Focusable: false,
}),
context.ContextCallbackOpts{},
),
Staging: context.NewPatchExplorerContext(
gui.Views.Staging,
@ -110,11 +105,9 @@ func (gui *Gui) contextTree() *context.ContextTree {
Key: context.PATCH_BUILDING_SECONDARY_CONTEXT_KEY,
Focusable: false,
}),
context.ContextCallbackOpts{},
),
MergeConflicts: context.NewMergeConflictsContext(
gui.Views.MergeConflicts,
context.ContextCallbackOpts{},
gui.c,
),
Confirmation: context.NewConfirmationContext(gui.c),
@ -127,7 +120,6 @@ func (gui *Gui) contextTree() *context.ContextTree {
Key: context.SEARCH_CONTEXT_KEY,
Focusable: true,
}),
context.ContextCallbackOpts{},
),
CommandLog: context.NewSimpleContext(
context.NewBaseContext(context.NewBaseContextOpts{
@ -137,7 +129,6 @@ func (gui *Gui) contextTree() *context.ContextTree {
Key: context.COMMAND_LOG_CONTEXT_KEY,
Focusable: true,
}),
context.ContextCallbackOpts{},
),
Options: context.NewDisplayContext(context.OPTIONS_CONTEXT_KEY, gui.Views.Options, "options"),
AppStatus: context.NewDisplayContext(context.APP_STATUS_CONTEXT_KEY, gui.Views.AppStatus, "appStatus"),