/
githubmirror
/
lazygit
Обзор
Документация
Войти
/
githubmirror
/
lazygit
Код
Запросы
0
Пакеты
0
Релизы
0
Аналитика
Безопасность
master
pkg/gui/mergeconflicts/rendering.go
35 строк
934 B
Stefan Haller
Fix linter warning about inefficient string concatenation
03 май 2026, 17:39
03 май 2026, 17:39
562d054
Код
Авторство
О чём код?
package mergeconflicts import ( "bytes" "github.com/jesseduffield/lazygit/pkg/gui/style" "github.com/jesseduffield/lazygit/pkg/theme" "github.com/jesseduffield/lazygit/pkg/utils" ) func ColoredConflictFile(state *State) string { content := state.GetContent() if len(state.conflicts) == 0 { return content } conflict, remainingConflicts := shiftConflict(state.conflicts) var outputBuffer bytes.Buffer for i, line := range utils.SplitLines(content) { textStyle := theme.DefaultTextColor if conflict.isMarkerLine(i) { textStyle = style.FgRed } if i == conflict.end && len(remainingConflicts) > 0 { conflict, remainingConflicts = shiftConflict(remainingConflicts) } outputBuffer.WriteString(textStyle.Sprint(line)) outputBuffer.WriteByte('\n') } return outputBuffer.String() } func shiftConflict(conflicts []*mergeConflict) (*mergeConflict, []*mergeConflict) { return conflicts[0], conflicts[1:] }