go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-02-03 13:21:56 +02:00
Code Issues Releases Activity

ensure initial context is set when entering submodule

Browse Source
This commit is contained in:
Jesse Duffield 2023-04-15 14:51:11 +10:00
parent 8a86de85c8
commit a5c72d056d
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/gui/context.go
View File

@ -23,12 +23,11 @@ type ContextMgr struct {
}
func NewContextMgr(
initialContext types.Context,
gui *Gui,
allContexts *context.ContextTree,
) *ContextMgr {
return &ContextMgr{
ContextStack: []types.Context{initialContext},
ContextStack: []types.Context{},
RWMutex: sync.RWMutex{},
gui: gui,
allContexts: allContexts,

2
pkg/gui/controllers.go
View File

@ -16,7 +16,7 @@ func (gui *Gui) Helpers() *helpers.Helpers {
return gui.helpers
}
func (gui *Gui) resetControllers() {
func (gui *Gui) resetHelpersAndControllers() {
helperCommon := gui.c
refsHelper := helpers.NewRefsHelper(helperCommon)

21
pkg/gui/gui.go
View File

@ -291,14 +291,18 @@ func (gui *Gui) onNewRepo(startArgs appTypes.StartArgs, reuseState bool) error {
return err
}
gui.resetState(startArgs, reuseState)
contextToPush := gui.resetState(startArgs, reuseState)
gui.resetControllers()
gui.resetHelpersAndControllers()
if err := gui.resetKeybindings(); err != nil {
return err
}
if err := gui.c.PushContext(contextToPush); err != nil {
return err
}
return nil
}
@ -311,7 +315,7 @@ func (gui *Gui) onNewRepo(startArgs appTypes.StartArgs, reuseState bool) error {
// it gets a bit confusing to land back in the status panel when visiting a repo
// you've already switched from. There's no doubt some easy way to make the UX
// optimal for all cases but I'm too lazy to think about what that is right now
func (gui *Gui) resetState(startArgs appTypes.StartArgs, reuseState bool) {
func (gui *Gui) resetState(startArgs appTypes.StartArgs, reuseState bool) types.Context {
currentDir, err := os.Getwd()
if reuseState {
@ -326,7 +330,7 @@ func (gui *Gui) resetState(startArgs appTypes.StartArgs, reuseState bool) {
gui.State.CurrentPopupOpts = nil
gui.Mutexes.PopupMutex.Unlock()
return
return gui.c.CurrentContext()
}
} else {
gui.c.Log.Error(err)
@ -335,7 +339,6 @@ func (gui *Gui) resetState(startArgs appTypes.StartArgs, reuseState bool) {
contextTree := gui.contextTree()
initialContext := initialContext(contextTree, startArgs)
initialScreenMode := initialScreenMode(startArgs, gui.Config)
gui.State = &GuiRepoState{
@ -356,16 +359,14 @@ func (gui *Gui) resetState(startArgs appTypes.StartArgs, reuseState bool) {
},
ScreenMode: initialScreenMode,
// TODO: only use contexts from context manager
ContextMgr: NewContextMgr(initialContext, gui, contextTree),
ContextMgr: NewContextMgr(gui, contextTree),
Contexts: contextTree,
WindowViewNameMap: initialWindowViewNameMap(contextTree),
}
if err := gui.c.PushContext(initialContext); err != nil {
gui.c.Log.Error(err)
}
gui.RepoStateMap[Repo(currentDir)] = gui.State
return initialContext(contextTree, startArgs)
}
func initialWindowViewNameMap(contextTree *context.ContextTree) *utils.ThreadSafeMap[string, string] {

4
pkg/gui/keybindings.go
View File

@ -52,8 +52,8 @@ func (self *Gui) GetCheatsheetKeybindings() []*types.Binding {
self.helpers = helpers.NewStubHelpers()
self.State = &GuiRepoState{}
self.State.Contexts = self.contextTree()
self.State.ContextMgr = NewContextMgr(nil, self, self.State.Contexts)
self.resetControllers()
self.State.ContextMgr = NewContextMgr(self, self.State.Contexts)
self.resetHelpersAndControllers()
bindings, _ := self.GetInitialKeybindings()
return bindings
}