mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-02-20 01:02:29 +08:00
06a9ff12ab
This brings in https://github.com/jesseduffield/gocui/pull/98 with the following fix: Fix rendering of CRLF sequence ('\r\n') The FirstGraphemeCluster call returns this as a single character; we want to treat it the same way as a single \n. This would be a problem if e.g. a progress bar used \r repeatedly to paint over the same line, and then printed a \n to move on to the next line; the last pair of \r and \n was swallowed. Another scenario where this was a problem was if you stream output of a command to the log, and the command used \r\n as line feeds. This happens for example for a background fetch that fails with an error; in that case we print the combined output (stdout plus stderr) to the log after the command finished, and for some reason it uses \r\n in that case (I can't actually explain why; when I do `git fetch --all | xxd` I see only bare \n characters). All output would appear on one line then. Also, filter out escape sequences for character set designation; there's nothing useful we can do with them. In practice, the only one that you are likely to see is `ESC ( B`, which is sent as part of tput sgr0, which is sometimes used in scripts to reset all graphics attributes to defaults.
275 lines
9.7 KiB
Go
275 lines
9.7 KiB
Go
package gui
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
|
|
"github.com/jesseduffield/gocui"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/context"
|
|
"github.com/jesseduffield/lazygit/pkg/theme"
|
|
"github.com/samber/lo"
|
|
"golang.org/x/exp/slices"
|
|
)
|
|
|
|
type viewNameMapping struct {
|
|
viewPtr **gocui.View
|
|
name string
|
|
}
|
|
|
|
func (gui *Gui) orderedViews() []*gocui.View {
|
|
return lo.Map(gui.orderedViewNameMappings(), func(v viewNameMapping, _ int) *gocui.View {
|
|
return *v.viewPtr
|
|
})
|
|
}
|
|
|
|
func (gui *Gui) orderedViewNameMappings() []viewNameMapping {
|
|
return []viewNameMapping{
|
|
// first layer. Ordering within this layer does not matter because there are
|
|
// no overlapping views
|
|
{viewPtr: &gui.Views.Status, name: "status"},
|
|
{viewPtr: &gui.Views.Snake, name: "snake"},
|
|
{viewPtr: &gui.Views.Submodules, name: "submodules"},
|
|
{viewPtr: &gui.Views.Worktrees, name: "worktrees"},
|
|
{viewPtr: &gui.Views.Files, name: "files"},
|
|
{viewPtr: &gui.Views.Tags, name: "tags"},
|
|
{viewPtr: &gui.Views.Remotes, name: "remotes"},
|
|
{viewPtr: &gui.Views.Branches, name: "localBranches"},
|
|
{viewPtr: &gui.Views.RemoteBranches, name: "remoteBranches"},
|
|
{viewPtr: &gui.Views.ReflogCommits, name: "reflogCommits"},
|
|
{viewPtr: &gui.Views.Commits, name: "commits"},
|
|
{viewPtr: &gui.Views.Stash, name: "stash"},
|
|
{viewPtr: &gui.Views.SubCommits, name: "subCommits"},
|
|
{viewPtr: &gui.Views.CommitFiles, name: "commitFiles"},
|
|
|
|
{viewPtr: &gui.Views.Staging, name: "staging"},
|
|
{viewPtr: &gui.Views.StagingSecondary, name: "stagingSecondary"},
|
|
{viewPtr: &gui.Views.PatchBuilding, name: "patchBuilding"},
|
|
{viewPtr: &gui.Views.PatchBuildingSecondary, name: "patchBuildingSecondary"},
|
|
{viewPtr: &gui.Views.MergeConflicts, name: "mergeConflicts"},
|
|
{viewPtr: &gui.Views.Secondary, name: "secondary"},
|
|
{viewPtr: &gui.Views.Main, name: "main"},
|
|
|
|
{viewPtr: &gui.Views.Extras, name: "extras"},
|
|
|
|
// bottom line
|
|
{viewPtr: &gui.Views.Options, name: "options"},
|
|
{viewPtr: &gui.Views.AppStatus, name: "appStatus"},
|
|
{viewPtr: &gui.Views.Information, name: "information"},
|
|
{viewPtr: &gui.Views.Search, name: "search"},
|
|
// this view shows either the "Search:" prompt when searching, or the "Filter:" prompt when filtering
|
|
{viewPtr: &gui.Views.SearchPrefix, name: "searchPrefix"},
|
|
// these views contain one space, and are used as spacers between the various views in the bottom line
|
|
{viewPtr: &gui.Views.StatusSpacer1, name: "statusSpacer1"},
|
|
{viewPtr: &gui.Views.StatusSpacer2, name: "statusSpacer2"},
|
|
|
|
// popups.
|
|
{viewPtr: &gui.Views.CommitMessage, name: "commitMessage"},
|
|
{viewPtr: &gui.Views.CommitDescription, name: "commitDescription"},
|
|
{viewPtr: &gui.Views.Menu, name: "menu"},
|
|
{viewPtr: &gui.Views.Suggestions, name: "suggestions"},
|
|
{viewPtr: &gui.Views.Confirmation, name: "confirmation"},
|
|
{viewPtr: &gui.Views.Prompt, name: "prompt"},
|
|
{viewPtr: &gui.Views.Tooltip, name: "tooltip"},
|
|
|
|
// this guy will cover everything else when it appears
|
|
{viewPtr: &gui.Views.Limit, name: "limit"},
|
|
}
|
|
}
|
|
|
|
func (gui *Gui) createAllViews() error {
|
|
var err error
|
|
for _, mapping := range gui.orderedViewNameMappings() {
|
|
*mapping.viewPtr, err = gui.prepareView(mapping.name)
|
|
if err != nil && !errors.Is(err, gocui.ErrUnknownView) {
|
|
return err
|
|
}
|
|
}
|
|
|
|
gui.Views.Options.Frame = false
|
|
|
|
gui.Views.SearchPrefix.BgColor = gocui.ColorDefault
|
|
gui.Views.SearchPrefix.FgColor = gocui.ColorCyan
|
|
gui.Views.SearchPrefix.Frame = false
|
|
|
|
gui.Views.StatusSpacer1.Frame = false
|
|
gui.Views.StatusSpacer2.Frame = false
|
|
|
|
gui.Views.Search.BgColor = gocui.ColorDefault
|
|
gui.Views.Search.FgColor = gocui.ColorCyan
|
|
gui.Views.Search.Editable = true
|
|
gui.Views.Search.Frame = false
|
|
gui.Views.Search.Editor = gocui.EditorFunc(gui.searchEditor)
|
|
|
|
for _, view := range []*gocui.View{gui.Views.Main, gui.Views.Secondary, gui.Views.Staging, gui.Views.StagingSecondary, gui.Views.PatchBuilding, gui.Views.PatchBuildingSecondary, gui.Views.MergeConflicts} {
|
|
view.Wrap = true
|
|
view.UnderlineHyperLinksOnlyOnHover = true
|
|
view.AutoRenderHyperLinks = true
|
|
}
|
|
|
|
gui.Views.Staging.Wrap = true
|
|
gui.Views.StagingSecondary.Wrap = true
|
|
gui.Views.PatchBuilding.Wrap = true
|
|
gui.Views.PatchBuildingSecondary.Wrap = true
|
|
gui.Views.MergeConflicts.Wrap = false
|
|
gui.Views.Limit.Wrap = true
|
|
|
|
gui.Views.AppStatus.BgColor = gocui.ColorDefault
|
|
gui.Views.AppStatus.FgColor = gocui.ColorCyan
|
|
gui.Views.AppStatus.Visible = false
|
|
gui.Views.AppStatus.Frame = false
|
|
|
|
gui.Views.CommitMessage.Visible = false
|
|
gui.Views.CommitMessage.Editable = true
|
|
gui.Views.CommitMessage.Editor = gocui.EditorFunc(gui.commitMessageEditor)
|
|
|
|
gui.Views.CommitDescription.Visible = false
|
|
gui.Views.CommitDescription.Editable = true
|
|
gui.Views.CommitDescription.Editor = gocui.EditorFunc(gui.commitDescriptionEditor)
|
|
|
|
gui.Views.Confirmation.Visible = false
|
|
gui.Views.Confirmation.Wrap = true
|
|
gui.Views.Confirmation.AutoRenderHyperLinks = true
|
|
|
|
gui.Views.Prompt.Visible = false
|
|
gui.Views.Prompt.Wrap = false // We don't want wrapping in one-line prompts
|
|
gui.Views.Prompt.Editable = true
|
|
gui.Views.Prompt.Editor = gocui.EditorFunc(gui.promptEditor)
|
|
|
|
gui.Views.Suggestions.Visible = false
|
|
|
|
gui.Views.Menu.Visible = false
|
|
|
|
gui.Views.Tooltip.Visible = false
|
|
gui.Views.Tooltip.AutoRenderHyperLinks = true
|
|
|
|
gui.Views.Information.BgColor = gocui.ColorDefault
|
|
gui.Views.Information.FgColor = gocui.ColorGreen
|
|
gui.Views.Information.Frame = false
|
|
|
|
gui.Views.Extras.Autoscroll = true
|
|
gui.Views.Extras.Wrap = true
|
|
gui.Views.Extras.AutoRenderHyperLinks = true
|
|
|
|
gui.Views.Snake.FgColor = gocui.ColorGreen
|
|
|
|
return nil
|
|
}
|
|
|
|
func (gui *Gui) configureViewProperties() {
|
|
frameRunes := []rune{'─', '│', '┌', '┐', '└', '┘'}
|
|
switch gui.c.UserConfig().Gui.Border {
|
|
case "double":
|
|
frameRunes = []rune{'═', '║', '╔', '╗', '╚', '╝'}
|
|
case "rounded":
|
|
frameRunes = []rune{'─', '│', '╭', '╮', '╰', '╯'}
|
|
case "hidden":
|
|
frameRunes = []rune{' ', ' ', ' ', ' ', ' ', ' '}
|
|
case "bold":
|
|
frameRunes = []rune{'━', '┃', '┏', '┓', '┗', '┛'}
|
|
}
|
|
|
|
for _, mapping := range gui.orderedViewNameMappings() {
|
|
(*mapping.viewPtr).FrameRunes = frameRunes
|
|
(*mapping.viewPtr).BgColor = gui.g.BgColor
|
|
(*mapping.viewPtr).FgColor = theme.GocuiDefaultTextColor
|
|
(*mapping.viewPtr).SelBgColor = theme.GocuiSelectedLineBgColor
|
|
(*mapping.viewPtr).SelFgColor = gui.g.SelFgColor
|
|
(*mapping.viewPtr).InactiveViewSelBgColor = theme.GocuiInactiveViewSelectedLineBgColor
|
|
}
|
|
|
|
gui.c.SetViewContent(gui.Views.SearchPrefix, gui.c.Tr.SearchPrefix)
|
|
|
|
gui.Views.Stash.Title = gui.c.Tr.StashTitle
|
|
gui.Views.Commits.Title = gui.c.Tr.CommitsTitle
|
|
gui.Views.CommitFiles.Title = gui.c.Tr.CommitFiles
|
|
gui.Views.Branches.Title = gui.c.Tr.BranchesTitle
|
|
gui.Views.Remotes.Title = gui.c.Tr.RemotesTitle
|
|
gui.Views.Worktrees.Title = gui.c.Tr.WorktreesTitle
|
|
gui.Views.Tags.Title = gui.c.Tr.TagsTitle
|
|
gui.Views.Files.Title = gui.c.Tr.FilesTitle
|
|
gui.Views.PatchBuilding.Title = gui.c.Tr.Patch
|
|
gui.Views.PatchBuildingSecondary.Title = gui.c.Tr.CustomPatch
|
|
gui.Views.MergeConflicts.Title = gui.c.Tr.MergeConflictsTitle
|
|
gui.Views.Limit.Title = gui.c.Tr.NotEnoughSpace
|
|
gui.Views.Status.Title = gui.c.Tr.StatusTitle
|
|
gui.Views.Staging.Title = gui.c.Tr.UnstagedChanges
|
|
gui.Views.StagingSecondary.Title = gui.c.Tr.StagedChanges
|
|
gui.Views.CommitMessage.Title = gui.c.Tr.CommitSummary
|
|
gui.Views.CommitDescription.Title = gui.c.Tr.CommitDescriptionTitle
|
|
gui.Views.Extras.Title = gui.c.Tr.CommandLog
|
|
gui.Views.Snake.Title = gui.c.Tr.SnakeTitle
|
|
|
|
for _, view := range []*gocui.View{gui.Views.Main, gui.Views.Secondary, gui.Views.Staging, gui.Views.StagingSecondary, gui.Views.PatchBuilding, gui.Views.PatchBuildingSecondary, gui.Views.MergeConflicts} {
|
|
view.Title = gui.c.Tr.DiffTitle
|
|
view.CanScrollPastBottom = gui.c.UserConfig().Gui.ScrollPastBottom
|
|
view.TabWidth = gui.c.UserConfig().Gui.TabWidth
|
|
}
|
|
|
|
gui.Views.CommitDescription.FgColor = theme.GocuiDefaultTextColor
|
|
gui.Views.CommitDescription.TextArea.AutoWrap = gui.c.UserConfig().Git.Commit.AutoWrapCommitMessage
|
|
gui.Views.CommitDescription.TextArea.AutoWrapWidth = gui.c.UserConfig().Git.Commit.AutoWrapWidth
|
|
|
|
if gui.c.UserConfig().Gui.ShowPanelJumps {
|
|
keyToTitlePrefix := func(key string) string {
|
|
if key == "<disabled>" {
|
|
return ""
|
|
}
|
|
return fmt.Sprintf("[%s]", key)
|
|
}
|
|
jumpBindings := gui.c.UserConfig().Keybinding.Universal.JumpToBlock
|
|
jumpLabels := lo.Map(jumpBindings, func(binding string, _ int) string {
|
|
return keyToTitlePrefix(binding)
|
|
})
|
|
|
|
gui.Views.Status.TitlePrefix = jumpLabels[0]
|
|
|
|
gui.Views.Files.TitlePrefix = jumpLabels[1]
|
|
gui.Views.Worktrees.TitlePrefix = jumpLabels[1]
|
|
gui.Views.Submodules.TitlePrefix = jumpLabels[1]
|
|
|
|
gui.Views.Branches.TitlePrefix = jumpLabels[2]
|
|
gui.Views.Remotes.TitlePrefix = jumpLabels[2]
|
|
gui.Views.Tags.TitlePrefix = jumpLabels[2]
|
|
|
|
gui.Views.Commits.TitlePrefix = jumpLabels[3]
|
|
gui.Views.ReflogCommits.TitlePrefix = jumpLabels[3]
|
|
|
|
gui.Views.Stash.TitlePrefix = jumpLabels[4]
|
|
|
|
gui.Views.Main.TitlePrefix = keyToTitlePrefix(gui.c.UserConfig().Keybinding.Universal.FocusMainView)
|
|
} else {
|
|
gui.Views.Status.TitlePrefix = ""
|
|
|
|
gui.Views.Files.TitlePrefix = ""
|
|
gui.Views.Worktrees.TitlePrefix = ""
|
|
gui.Views.Submodules.TitlePrefix = ""
|
|
|
|
gui.Views.Branches.TitlePrefix = ""
|
|
gui.Views.Remotes.TitlePrefix = ""
|
|
gui.Views.Tags.TitlePrefix = ""
|
|
|
|
gui.Views.Commits.TitlePrefix = ""
|
|
gui.Views.ReflogCommits.TitlePrefix = ""
|
|
|
|
gui.Views.Stash.TitlePrefix = ""
|
|
|
|
gui.Views.Main.TitlePrefix = ""
|
|
}
|
|
|
|
for _, view := range gui.g.Views() {
|
|
// if the view is in our mapping, we'll set the tabs and the tab index
|
|
for _, values := range gui.viewTabMap() {
|
|
index := slices.IndexFunc(values, func(tabContext context.TabView) bool {
|
|
return tabContext.ViewName == view.Name()
|
|
})
|
|
|
|
if index != -1 {
|
|
view.Tabs = lo.Map(values, func(tabContext context.TabView, _ int) string {
|
|
return tabContext.Tab
|
|
})
|
|
view.TabIndex = index
|
|
}
|
|
}
|
|
}
|
|
}
|