mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-05-11 12:25:47 +02:00
Refactor: extract function clampLineIdx
And reimplement using lo.Clamp instead of comparing manually.
This commit is contained in:
parent
61636d820c
commit
a3ae1c8e4d
1 changed files with 6 additions and 7 deletions
|
@ -7,6 +7,7 @@ import (
|
||||||
"github.com/jesseduffield/gocui"
|
"github.com/jesseduffield/gocui"
|
||||||
"github.com/jesseduffield/lazygit/pkg/commands/patch"
|
"github.com/jesseduffield/lazygit/pkg/commands/patch"
|
||||||
"github.com/jesseduffield/lazygit/pkg/utils"
|
"github.com/jesseduffield/lazygit/pkg/utils"
|
||||||
|
"github.com/samber/lo"
|
||||||
)
|
)
|
||||||
|
|
||||||
// State represents the current state of the patch explorer context i.e. when
|
// State represents the current state of the patch explorer context i.e. when
|
||||||
|
@ -177,15 +178,13 @@ func (s *State) SelectLine(newSelectedLineIdx int) {
|
||||||
s.selectLineWithoutRangeCheck(newSelectedLineIdx)
|
s.selectLineWithoutRangeCheck(newSelectedLineIdx)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *State) clampLineIdx(lineIdx int) int {
|
||||||
|
return lo.Clamp(lineIdx, 0, len(s.patchLineIndices)-1)
|
||||||
|
}
|
||||||
|
|
||||||
// This just moves the cursor without caring about range select
|
// This just moves the cursor without caring about range select
|
||||||
func (s *State) selectLineWithoutRangeCheck(newSelectedLineIdx int) {
|
func (s *State) selectLineWithoutRangeCheck(newSelectedLineIdx int) {
|
||||||
if newSelectedLineIdx < 0 {
|
s.selectedLineIdx = s.clampLineIdx(newSelectedLineIdx)
|
||||||
newSelectedLineIdx = 0
|
|
||||||
} else if newSelectedLineIdx > len(s.patchLineIndices)-1 {
|
|
||||||
newSelectedLineIdx = len(s.patchLineIndices) - 1
|
|
||||||
}
|
|
||||||
|
|
||||||
s.selectedLineIdx = newSelectedLineIdx
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *State) SelectNewLineForRange(newSelectedLineIdx int) {
|
func (s *State) SelectNewLineForRange(newSelectedLineIdx int) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue