sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

simplify code a bit

Browse Source
This commit is contained in:
Jesse Duffield
2021-07-31 12:54:28 +10:00
parent 79848087bc
commit 117c0bd4f7
15 changed files with 301 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/gui/mergeconflicts/rendering.go
View File

@ -15,18 +15,18 @@ func ColoredConflictFile(content string, state *State, hasFocus bool) string {
conflict, remainingConflicts := shiftConflict(state.conflicts)
var outputBuffer bytes.Buffer
for i, line := range utils.SplitLines(content) {
colour := theme.DefaultTextColor
textStyle := theme.DefaultTextColor
if i == conflict.start || i == conflict.middle || i == conflict.end {
colour.SetColor(style.FgRed)
textStyle = style.FgRed
}
if hasFocus && state.conflictIndex < len(state.conflicts) && *state.conflicts[state.conflictIndex] == *conflict && shouldHighlightLine(i, conflict, state.conflictTop) {
colour = theme.SelectedRangeBgColor.SetBold(true)
textStyle = theme.SelectedRangeBgColor.SetBold()
}
if i == conflict.end && len(remainingConflicts) > 0 {
conflict, remainingConflicts = shiftConflict(remainingConflicts)
}
outputBuffer.WriteString(colour.Sprint(line) + "\n")
outputBuffer.WriteString(textStyle.Sprint(line) + "\n")
}
return outputBuffer.String()
}