mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-04-04 22:34:39 +02:00
fdff2dec79
In go 1.22, loop variables are redeclared with each iteration of the loop, rather than simple updated on each iteration. This means that we no longer need to manually redeclare variables when they're closed over by a function.
123 lines
1.6 KiB
Go
123 lines
1.6 KiB
Go
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))
|
|
})
|
|
}
|
|
}
|