1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2024-12-04 10:34:55 +02:00
lazygit/pkg/gui/mergeconflicts/find_conflicts.go

61 lines
1.2 KiB
Go
Raw Normal View History

2021-05-30 07:22:04 +02:00
package mergeconflicts
import (
"strings"
"github.com/jesseduffield/lazygit/pkg/utils"
)
// LineType tells us whether a given line is a start/middle/end marker of a conflict,
// or if it's not a marker at all
type LineType int
const (
START LineType = iota
MIDDLE
END
NOT_A_MARKER
)
func findConflicts(content string) []*mergeConflict {
conflicts := make([]*mergeConflict, 0)
if content == "" {
return conflicts
}
var newConflict *mergeConflict
for i, line := range utils.SplitLines(content) {
switch determineLineType(line) {
case START:
newConflict = &mergeConflict{start: i}
case MIDDLE:
newConflict.middle = i
case END:
newConflict.end = i
conflicts = append(conflicts, newConflict)
2021-06-02 19:53:01 +02:00
// reset value to avoid any possible silent mutations in further iterations
newConflict = nil
2021-05-30 07:22:04 +02:00
default:
// line isn't a merge conflict marker so we just continue
}
}
return conflicts
}
func determineLineType(line string) LineType {
trimmedLine := strings.TrimPrefix(line, "++")
2021-06-05 05:30:55 +02:00
switch {
case strings.HasPrefix(trimmedLine, "<<<<<<< "):
return START
case trimmedLine == "=======":
return MIDDLE
case strings.HasPrefix(trimmedLine, ">>>>>>> "):
return END
default:
return NOT_A_MARKER
2021-05-30 07:22:04 +02:00
}
}