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

add mergeConflict#hasAncestor

Browse Source
This commit is contained in:
Ryooooooga
2021-08-23 18:28:20 +09:00
committed by Jesse Duffield
parent 73548fa15f
commit cf8ded0b79
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/gui/mergeconflicts/state.go
View File

@ -25,6 +25,10 @@ type mergeConflict struct {
end int
}
func (c *mergeConflict) hasAncestor() bool {
return c.ancestor >= 0
}
type State struct {
sync.Mutex
conflictIndex int
@ -48,7 +52,7 @@ func (s *State) SelectPrevConflictHunk() {
case MIDDLE:
s.conflictSelection = TOP
case BOTTOM:
if s.currentConflict().ancestor >= 0 {
if s.currentConflict().hasAncestor() {
s.conflictSelection = MIDDLE
} else {
s.conflictSelection = TOP
@ -59,7 +63,7 @@ func (s *State) SelectPrevConflictHunk() {
func (s *State) SelectNextConflictHunk() {
switch s.conflictSelection {
case TOP:
if s.currentConflict().ancestor >= 0 {
if s.currentConflict().hasAncestor() {
s.conflictSelection = MIDDLE
} else {
s.conflictSelection = BOTTOM
@ -163,7 +167,7 @@ func isIndexToDelete(i int, conflict *mergeConflict, selection Selection) bool {
var isWantedContent bool
switch selection {
case TOP:
if conflict.ancestor >= 0 {
if conflict.hasAncestor() {
isWantedContent = conflict.start < i && i < conflict.ancestor
} else {
isWantedContent = conflict.start < i && i < conflict.target