/
githubmirror
/
lazygit
Обзор
Документация
Войти
/
githubmirror
/
lazygit
Код
Запросы
0
Пакеты
0
Релизы
0
Аналитика
Безопасность
master
pkg/gui/mergeconflicts/state_test.go
122 строки
2 KB
Stefan Haller
Make the conflict marker size a parameter of our marker matching
08 авг 2026, 13:43
08 авг 2026, 13:43
bc9faff
Код
Авторство
О чём код?
package mergeconflicts import ( "testing" "github.com/stretchr/testify/assert" ) func TestFindConflicts(t *testing.T) { type scenario struct { name string content string expected []*mergeConflict } scenarios := []scenario{ { name: "empty", content: "", expected: []*mergeConflict{}, }, { name: "various conflicts", content: `++<<<<<<< HEAD foo ++======= bar ++>>>>>>> branch <<<<<<< HEAD: foo/bar/baz.go foo bar ======= baz >>>>>>> branch ++<<<<<<< MERGE_HEAD foo ++======= bar ++>>>>>>> branch ++<<<<<<< Updated upstream foo ++======= bar ++>>>>>>> branch ++<<<<<<< ours foo ++======= bar ++>>>>>>> branch <<<<<<< Updated upstream: foo/bar/baz.go foo bar ======= baz >>>>>>> branch <<<<<<< HEAD foo ||||||| fffffff bar ======= baz >>>>>>> branch `, expected: []*mergeConflict{ { start: 0, ancestor: -1, target: 2, end: 4, }, { start: 6, ancestor: -1, target: 9, end: 11, }, { start: 13, ancestor: -1, target: 15, end: 17, }, { start: 19, ancestor: -1, target: 21, end: 23, }, { start: 25, ancestor: -1, target: 27, end: 29, }, { start: 31, ancestor: -1, target: 34, end: 36, }, { start: 38, ancestor: 40, target: 42, end: 44, }, }, }, } for _, s := range scenarios { t.Run(s.name, func(t *testing.T) { assert.EqualValues(t, s.expected, findConflicts(s.content, defaultConflictMarkerSize)) }) } }