mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-08-24 10:13:41 -05:00
Stefan HallerandClaude Fable 5
74a77e58be
The transient contexts (remoteBranches, subCommits, commitFiles) take
over the window of the context they are drilled into from, but until
then they carry a hardcoded initial window ("branches" or
"commits"). Under a gui.sidePanels config where those tabs aren't
their panel's first, no window of that name exists, leaving the
window-to-view map with entries for windows the layout never
produces. The previous commit made such entries harmless, but there's
no reason to have contexts point at nonexistent windows in the first
place; assign them the window hosting branches or commits instead,
which the config validation guarantees to exist.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
51 lines
1.5 KiB
Go
51 lines
1.5 KiB
Go
package gui
|
|
|
|
import (
|
|
"sort"
|
|
"testing"
|
|
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
"github.com/samber/lo"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func sortedKeys[V any](m map[string]V) []string {
|
|
keys := lo.Keys(m)
|
|
sort.Strings(keys)
|
|
return keys
|
|
}
|
|
|
|
// The three lookups that translate gui.sidePanels names into views, titles, and
|
|
// contexts must each cover exactly the set of valid names, or a config that uses
|
|
// a name missing from one of them would hit a nil lookup at runtime.
|
|
func TestSidePanelLookupsCoverAllValidTabs(t *testing.T) {
|
|
want := lo.Uniq(config.ValidSidePanelTabs)
|
|
sort.Strings(want)
|
|
|
|
gui := NewDummyGui()
|
|
|
|
assert.Equal(t, want, sortedKeys(sidePanelViewNames))
|
|
assert.Equal(t, want, sortedKeys(gui.sidePanelTabTitles()))
|
|
assert.Equal(t, want, sortedKeys(sidePanelContexts(gui.contextTree())))
|
|
}
|
|
|
|
// The transient contexts must end up in windows that exist under the configured
|
|
// panel layout, or their views would be laid out for a window that is never
|
|
// shown.
|
|
func TestAssignSidePanelWindowsCoversTransientContexts(t *testing.T) {
|
|
gui := NewDummyGui()
|
|
gui.c.UserConfig().Gui.SidePanels = []config.SidePanel{
|
|
{"worktrees", "branches", "remotes"},
|
|
{"files"},
|
|
{"tags", "commits"},
|
|
{"stash"},
|
|
}
|
|
|
|
contextTree := gui.contextTree()
|
|
gui.assignSidePanelWindows(contextTree)
|
|
|
|
assert.Equal(t, "worktrees", contextTree.RemoteBranches.GetWindowName())
|
|
assert.Equal(t, "worktrees", contextTree.SubCommits.GetWindowName())
|
|
assert.Equal(t, "tags", contextTree.CommitFiles.GetWindowName())
|
|
}
|