mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-03-19 21:28:28 +02:00
We're not fully standardising here: different contexts can store their range state however they like. What we are standardising on is that now the view is always responsible for highlighting the selected lines, meaning the context/controller needs to tell the view where the range start is. Two convenient benefits from this change: 1) we no longer need bespoke code in integration tests for asserting on selected lines because we can just ask the view 2) line selection in staging/patch-building/merge-conflicts views now look the same as in list views i.e. the highlight applies to the whole line (including trailing space) I also noticed a bug with merge conflicts not rendering the selection on focus though I suspect it wasn't a bug with any real consequences when the view wasn't displaying the selection. I'm going to scrap the selectedRangeBgColor config and just let it use the single line background color. Hopefully nobody cares, but there's really no need for an extra config.
150 lines
3.6 KiB
Go
150 lines
3.6 KiB
Go
package patch
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"github.com/jesseduffield/generics/set"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/style"
|
|
"github.com/jesseduffield/lazygit/pkg/theme"
|
|
"github.com/samber/lo"
|
|
)
|
|
|
|
type patchPresenter struct {
|
|
patch *Patch
|
|
// if true, all following fields are ignored
|
|
plain bool
|
|
|
|
// line indices for tagged lines (e.g. lines added to a custom patch)
|
|
incLineIndices *set.Set[int]
|
|
}
|
|
|
|
// formats the patch as a plain string
|
|
func formatPlain(patch *Patch) string {
|
|
presenter := &patchPresenter{
|
|
patch: patch,
|
|
plain: true,
|
|
incLineIndices: set.New[int](),
|
|
}
|
|
return presenter.format()
|
|
}
|
|
|
|
func formatRangePlain(patch *Patch, startIdx int, endIdx int) string {
|
|
lines := patch.Lines()[startIdx : endIdx+1]
|
|
return strings.Join(
|
|
lo.Map(lines, func(line *PatchLine, _ int) string {
|
|
return line.Content + "\n"
|
|
}),
|
|
"",
|
|
)
|
|
}
|
|
|
|
type FormatViewOpts struct {
|
|
// line indices for tagged lines (e.g. lines added to a custom patch)
|
|
IncLineIndices *set.Set[int]
|
|
}
|
|
|
|
// formats the patch for rendering within a view, meaning it's coloured and
|
|
// highlights selected items
|
|
func formatView(patch *Patch, opts FormatViewOpts) string {
|
|
includedLineIndices := opts.IncLineIndices
|
|
if includedLineIndices == nil {
|
|
includedLineIndices = set.New[int]()
|
|
}
|
|
presenter := &patchPresenter{
|
|
patch: patch,
|
|
plain: false,
|
|
incLineIndices: includedLineIndices,
|
|
}
|
|
return presenter.format()
|
|
}
|
|
|
|
func (self *patchPresenter) format() string {
|
|
// if we have no changes in our patch (i.e. no additions or deletions) then
|
|
// the patch is effectively empty and we can return an empty string
|
|
if !self.patch.ContainsChanges() {
|
|
return ""
|
|
}
|
|
|
|
stringBuilder := &strings.Builder{}
|
|
lineIdx := 0
|
|
appendLine := func(line string) {
|
|
_, _ = stringBuilder.WriteString(line + "\n")
|
|
|
|
lineIdx++
|
|
}
|
|
appendFormattedLine := func(line string, style style.TextStyle) {
|
|
formattedLine := self.formatLine(
|
|
line,
|
|
style,
|
|
lineIdx,
|
|
)
|
|
|
|
appendLine(formattedLine)
|
|
}
|
|
|
|
for _, line := range self.patch.header {
|
|
appendFormattedLine(line, theme.DefaultTextColor.SetBold())
|
|
}
|
|
|
|
for _, hunk := range self.patch.hunks {
|
|
appendLine(
|
|
self.formatLine(
|
|
hunk.formatHeaderStart(),
|
|
style.FgCyan,
|
|
lineIdx,
|
|
) +
|
|
// we're splitting the line into two parts: the diff header and the context
|
|
// We explicitly pass 'included' as false here so that we're only tagging the
|
|
// first half of the line as included if the line is indeed included.
|
|
self.formatLineAux(
|
|
hunk.headerContext,
|
|
theme.DefaultTextColor,
|
|
false,
|
|
),
|
|
)
|
|
|
|
for _, line := range hunk.bodyLines {
|
|
appendFormattedLine(line.Content, self.patchLineStyle(line))
|
|
}
|
|
}
|
|
|
|
return stringBuilder.String()
|
|
}
|
|
|
|
func (self *patchPresenter) patchLineStyle(patchLine *PatchLine) style.TextStyle {
|
|
switch patchLine.Kind {
|
|
case ADDITION:
|
|
return style.FgGreen
|
|
case DELETION:
|
|
return style.FgRed
|
|
default:
|
|
return theme.DefaultTextColor
|
|
}
|
|
}
|
|
|
|
func (self *patchPresenter) formatLine(str string, textStyle style.TextStyle, index int) string {
|
|
included := self.incLineIndices.Includes(index)
|
|
|
|
return self.formatLineAux(str, textStyle, included)
|
|
}
|
|
|
|
// 'selected' means you've got it highlighted with your cursor
|
|
// 'included' means the line has been included in the patch (only applicable when
|
|
// building a patch)
|
|
func (self *patchPresenter) formatLineAux(str string, textStyle style.TextStyle, included bool) string {
|
|
if self.plain {
|
|
return str
|
|
}
|
|
|
|
firstCharStyle := textStyle
|
|
if included {
|
|
firstCharStyle = firstCharStyle.MergeStyle(style.BgGreen)
|
|
}
|
|
|
|
if len(str) < 2 {
|
|
return firstCharStyle.Sprint(str)
|
|
}
|
|
|
|
return firstCharStyle.Sprint(str[:1]) + textStyle.Sprint(str[1:])
|
|
}
|