diff options
Diffstat (limited to 'pkg/cheatsheet/generate.go')
| -rw-r--r-- | pkg/cheatsheet/generate.go | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/pkg/cheatsheet/generate.go b/pkg/cheatsheet/generate.go index 5117e6652..d69a448fb 100644 --- a/pkg/cheatsheet/generate.go +++ b/pkg/cheatsheet/generate.go @@ -21,7 +21,6 @@ import ( "github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/i18n" "github.com/jesseduffield/lazygit/pkg/integration" - "github.com/jesseduffield/lazygit/pkg/utils" "github.com/samber/lo" ) @@ -105,10 +104,9 @@ func localisedTitle(tr *i18n.TranslationSet, str string) string { "commits": tr.CommitsTitle, "confirmation": tr.ConfirmationTitle, "information": tr.InformationTitle, - "main": tr.MainTitle, + "main": tr.NormalTitle, "patchBuilding": tr.PatchBuildingTitle, "merging": tr.MergingTitle, - "normal": tr.NormalTitle, "staging": tr.StagingTitle, "menu": tr.MenuTitle, "search": tr.SearchTitle, @@ -127,12 +125,17 @@ func localisedTitle(tr *i18n.TranslationSet, str string) string { } func getBindingSections(bindings []*types.Binding, tr *i18n.TranslationSet) []*bindingSection { + excludedViews := []string{"stagingSecondary", "patchBuildingSecondary"} bindingsToDisplay := slices.Filter(bindings, func(binding *types.Binding) bool { - return binding.Description != "" || binding.Alternative != "" + if lo.Contains(excludedViews, binding.ViewName) { + return false + } + + return (binding.Description != "" || binding.Alternative != "") }) - bindingsByHeader := utils.MuiltiGroupBy(bindingsToDisplay, func(binding *types.Binding) []header { - return getHeaders(binding, tr) + bindingsByHeader := lo.GroupBy(bindingsToDisplay, func(binding *types.Binding) header { + return getHeader(binding, tr) }) bindingGroups := maps.MapToSlice( @@ -164,24 +167,16 @@ func getBindingSections(bindings []*types.Binding, tr *i18n.TranslationSet) []*b }) } -// a binding may belong to multiple headers if it is applicable to multiple contexts, -// for example the copy-to-clipboard binding. -func getHeaders(binding *types.Binding, tr *i18n.TranslationSet) []header { +func getHeader(binding *types.Binding, tr *i18n.TranslationSet) header { if binding.Tag == "navigation" { - return []header{{priority: 2, title: localisedTitle(tr, "navigation")}} + return header{priority: 2, title: localisedTitle(tr, "navigation")} } if binding.ViewName == "" { - return []header{{priority: 3, title: localisedTitle(tr, "global")}} + return header{priority: 3, title: localisedTitle(tr, "global")} } - if len(binding.Contexts) == 0 { - return []header{} - } - - return slices.Map(binding.Contexts, func(context string) header { - return header{priority: 1, title: localisedTitle(tr, context)} - }) + return header{priority: 1, title: localisedTitle(tr, binding.ViewName)} } func formatSections(tr *i18n.TranslationSet, bindingSections []*bindingSection) string { |