sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-31 14:24:25 +03:00
Code Activity

ensure we retain state when returning to submodule parent

Browse Source
This commit is contained in:
Jesse Duffield
2022-02-13 11:35:42 +11:00
parent 94d66b267d
commit 943a8e83da
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/gui/gui.go
View File

@ -323,6 +323,8 @@ func (gui *Gui) resetState(filterPath string, reuseState bool) {
if state := gui.RepoStateMap[Repo(currentDir)]; state != nil {
gui.State = state
gui.State.ViewsSetup = false
gui.syncViewContexts()
return
}
} else {
gui.c.Log.Error(err)
@ -341,11 +343,6 @@ func (gui *Gui) resetState(filterPath string, reuseState bool) {
viewContextMap := context.NewViewContextMap()
for viewName, context := range initialViewContextMapping(contextTree) {
viewContextMap.Set(viewName, context)
view, err := gui.g.View(viewName)
if err != nil {
panic(err)
}
view.Context = string(context.GetKey())
}
gui.State = &GuiRepoState{
@ -380,9 +377,21 @@ func (gui *Gui) resetState(filterPath string, reuseState bool) {
Contexts: contextTree,
}
gui.syncViewContexts()
gui.RepoStateMap[Repo(currentDir)] = gui.State
}
func (gui *Gui) syncViewContexts() {
for viewName, context := range gui.State.ViewContextMap.Entries() {
view, err := gui.g.View(viewName)
if err != nil {
panic(err)
}
view.Context = string(context.GetKey())
}
}
func initialViewContextMapping(contextTree *context.ContextTree) map[string]types.Context {
return map[string]types.Context{
"status": contextTree.Status,