go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-05 00:59:19 +02:00
Code Issues Releases Activity

Instantiate other mutexes by value

Browse Source 
Like in the previous commit, this is preferred because the fields don't need to
be initialized this way.
This commit is contained in:
Stefan Haller
2025-06-09 16:16:20 +02:00
parent 5ee5d42511
commit fd270768e8
6 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/commands/git_commands/main_branches.go
View File

@ -21,7 +21,7 @@ type MainBranches struct {
previousMainBranches []string previousMainBranches []string
cmd oscommands.ICmdObjBuilder cmd oscommands.ICmdObjBuilder
mutex *deadlock.Mutex mutex deadlock.Mutex
} }
func NewMainBranches( func NewMainBranches(
@ -32,7 +32,6 @@ func NewMainBranches(
c: cmn, c: cmn,
existingMainBranches: nil, existingMainBranches: nil,
cmd: cmd, cmd: cmd,
mutex: &deadlock.Mutex{},
} }
} }

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

@ -16,14 +16,13 @@ type FilteredList[T any] struct {
getFilterFields func(T) []string getFilterFields func(T) []string
filter string filter string
mutex *deadlock.Mutex mutex deadlock.Mutex
} }
func NewFilteredList[T any](getList func() []T, getFilterFields func(T) []string) *FilteredList[T] { func NewFilteredList[T any](getList func() []T, getFilterFields func(T) []string) *FilteredList[T] {
return &FilteredList[T]{ return &FilteredList[T]{
getList: getList, getList: getList,
getFilterFields: getFilterFields, getFilterFields: getFilterFields,
mutex: &deadlock.Mutex{},
} }
} }

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

@ -12,7 +12,7 @@ type MergeConflictsContext struct {
types.Context types.Context
viewModel *ConflictsViewModel viewModel *ConflictsViewModel
c *ContextCommon c *ContextCommon
mutex *deadlock.Mutex mutex deadlock.Mutex
} }
type ConflictsViewModel struct { type ConflictsViewModel struct {
@ -33,7 +33,6 @@ func NewMergeConflictsContext(
return &MergeConflictsContext{ return &MergeConflictsContext{
viewModel: viewModel, viewModel: viewModel,
mutex: &deadlock.Mutex{},
Context: NewSimpleContext( Context: NewSimpleContext(
NewBaseContext(NewBaseContextOpts{ NewBaseContext(NewBaseContextOpts{
Kind: types.MAIN_CONTEXT, Kind: types.MAIN_CONTEXT,
@ -57,7 +56,7 @@ func (self *MergeConflictsContext) SetState(state *mergeconflicts.State) {
} }
func (self *MergeConflictsContext) GetMutex() *deadlock.Mutex { func (self *MergeConflictsContext) GetMutex() *deadlock.Mutex {
return self.mutex return &self.mutex
} }
func (self *MergeConflictsContext) SetUserScrolling(isScrolling bool) { func (self *MergeConflictsContext) SetUserScrolling(isScrolling bool) {

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

@ -15,7 +15,7 @@ type PatchExplorerContext struct {
viewTrait *ViewTrait viewTrait *ViewTrait
getIncludedLineIndices func() []int getIncludedLineIndices func() []int
c *ContextCommon c *ContextCommon
mutex *deadlock.Mutex mutex deadlock.Mutex
} }
var ( var (
@ -36,7 +36,6 @@ func NewPatchExplorerContext(
state: nil, state: nil,
viewTrait: NewViewTrait(view), viewTrait: NewViewTrait(view),
c: c, c: c,
mutex: &deadlock.Mutex{},
getIncludedLineIndices: getIncludedLineIndices, getIncludedLineIndices: getIncludedLineIndices,
SimpleContext: NewSimpleContext(NewBaseContext(NewBaseContextOpts{ SimpleContext: NewSimpleContext(NewBaseContext(NewBaseContextOpts{
View: view, View: view,
@ -137,7 +136,7 @@ func (self *PatchExplorerContext) NavigateTo(selectedLineIdx int) {
} }
func (self *PatchExplorerContext) GetMutex() *deadlock.Mutex { func (self *PatchExplorerContext) GetMutex() *deadlock.Mutex {
return self.mutex return &self.mutex
} }
func (self *PatchExplorerContext) ModelSearchResults(searchStr string, caseSensitive bool) []gocui.SearchPosition { func (self *PatchExplorerContext) ModelSearchResults(searchStr string, caseSensitive bool) []gocui.SearchPosition {

3
pkg/gui/controllers/helpers/inline_status_helper.go
View File

@ -15,7 +15,7 @@ type InlineStatusHelper struct {
windowHelper *WindowHelper windowHelper *WindowHelper
contextsWithInlineStatus map[types.ContextKey]*inlineStatusInfo contextsWithInlineStatus map[types.ContextKey]*inlineStatusInfo
mutex *deadlock.Mutex mutex deadlock.Mutex
} }
func NewInlineStatusHelper(c *HelperCommon, windowHelper *WindowHelper) *InlineStatusHelper { func NewInlineStatusHelper(c *HelperCommon, windowHelper *WindowHelper) *InlineStatusHelper {
@ -23,7 +23,6 @@ func NewInlineStatusHelper(c *HelperCommon, windowHelper *WindowHelper) *InlineS
c: c, c: c,
windowHelper: windowHelper, windowHelper: windowHelper,
contextsWithInlineStatus: make(map[types.ContextKey]*inlineStatusInfo), contextsWithInlineStatus: make(map[types.ContextKey]*inlineStatusInfo),
mutex: &deadlock.Mutex{},
} }
} }

5
pkg/gui/gui.go
View File

@ -118,7 +118,7 @@ type Gui struct {
// is being pushed). At the moment the rule is to use an item operation when // is being pushed). At the moment the rule is to use an item operation when
// we need to talk to the remote. // we need to talk to the remote.
itemOperations map[string]types.ItemOperation itemOperations map[string]types.ItemOperation
itemOperationsMutex *deadlock.Mutex itemOperationsMutex deadlock.Mutex
PrevLayout PrevLayout PrevLayout PrevLayout
@ -684,8 +684,7 @@ func NewGui(
InitialDir: initialDir, InitialDir: initialDir,
afterLayoutFuncs: make(chan func() error, 1000), afterLayoutFuncs: make(chan func() error, 1000),
itemOperations: make(map[string]types.ItemOperation), itemOperations: make(map[string]types.ItemOperation),
itemOperationsMutex: &deadlock.Mutex{},
} }
gui.PopupHandler = popup.NewPopupHandler( gui.PopupHandler = popup.NewPopupHandler(