mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-12 12:55:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove utils.Clamp, use lo.Clamp instead

Browse source
This commit is contained in:
Stefan Haller 2024-10-15 15:28:33 +02:00
parent 6c0ee7df2b
commit b97dd6bc3f
5 changed files with 9 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pkg/commands/patch/patch.go
View file

@ -1,7 +1,6 @@
package patch package patch
import ( import (
"github.com/jesseduffield/lazygit/pkg/utils"
"github.com/samber/lo" "github.com/samber/lo"
) )
@ -54,7 +53,7 @@ func (self *Patch) Lines() []*PatchLine {
// Returns the patch line index of the first line in the given hunk // Returns the patch line index of the first line in the given hunk
func (self *Patch) HunkStartIdx(hunkIndex int) int { func (self *Patch) HunkStartIdx(hunkIndex int) int {
hunkIndex = utils.Clamp(hunkIndex, 0, len(self.hunks)-1) hunkIndex = lo.Clamp(hunkIndex, 0, len(self.hunks)-1)
result := len(self.header) result := len(self.header)
for i := 0; i < hunkIndex; i++ { for i := 0; i < hunkIndex; i++ {
@ -65,7 +64,7 @@ func (self *Patch) HunkStartIdx(hunkIndex int) int {
// Returns the patch line index of the last line in the given hunk // Returns the patch line index of the last line in the given hunk
func (self *Patch) HunkEndIdx(hunkIndex int) int { func (self *Patch) HunkEndIdx(hunkIndex int) int {
hunkIndex = utils.Clamp(hunkIndex, 0, len(self.hunks)-1) hunkIndex = lo.Clamp(hunkIndex, 0, len(self.hunks)-1)
return self.HunkStartIdx(hunkIndex) + self.hunks[hunkIndex].lineCount() - 1 return self.HunkStartIdx(hunkIndex) + self.hunks[hunkIndex].lineCount() - 1
} }
@ -118,7 +117,7 @@ func (self *Patch) HunkContainingLine(idx int) int {
// Returns the patch line index of the next change (i.e. addition or deletion). // Returns the patch line index of the next change (i.e. addition or deletion).
func (self *Patch) GetNextChangeIdx(idx int) int { func (self *Patch) GetNextChangeIdx(idx int) int {
idx = utils.Clamp(idx, 0, self.LineCount()-1) idx = lo.Clamp(idx, 0, self.LineCount()-1)
lines := self.Lines() lines := self.Lines()

2
pkg/gui/context/list_renderer.go
View file

@ -52,7 +52,7 @@ func (self *ListRenderer) ModelIndexToViewIndex(modelIndex int) int {
} }
func (self *ListRenderer) ViewIndexToModelIndex(viewIndex int) int { func (self *ListRenderer) ViewIndexToModelIndex(viewIndex int) int {
viewIndex = utils.Clamp(viewIndex, 0, self.list.Len()+self.numNonModelItems) viewIndex = lo.Clamp(viewIndex, 0, self.list.Len()+self.numNonModelItems)
if self.modelIndicesByViewIndex != nil { if self.modelIndicesByViewIndex != nil {
return self.modelIndicesByViewIndex[viewIndex] return self.modelIndicesByViewIndex[viewIndex]
} }

3
pkg/gui/context/traits/list_cursor.go
View file

@ -3,6 +3,7 @@ package traits
import ( import (
"github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/gui/types"
"github.com/jesseduffield/lazygit/pkg/utils" "github.com/jesseduffield/lazygit/pkg/utils"
"github.com/samber/lo"
) )
type RangeSelectMode int type RangeSelectMode int
@ -85,7 +86,7 @@ func (self *ListCursor) clampValue(value int) int {
clampedValue := -1 clampedValue := -1
length := self.getLength() length := self.getLength()
if length > 0 { if length > 0 {
clampedValue = utils.Clamp(value, 0, length-1) clampedValue = lo.Clamp(value, 0, length-1)
} }
return clampedValue return clampedValue

5
pkg/gui/mergeconflicts/state.go
View file

@ -4,6 +4,7 @@ import (
"strings" "strings"
"github.com/jesseduffield/lazygit/pkg/utils" "github.com/jesseduffield/lazygit/pkg/utils"
"github.com/samber/lo"
) )
// State represents the selection state of the merge conflict context. // State represents the selection state of the merge conflict context.
@ -37,14 +38,14 @@ func (s *State) setConflictIndex(index int) {
if len(s.conflicts) == 0 { if len(s.conflicts) == 0 {
s.conflictIndex = 0 s.conflictIndex = 0
} else { } else {
s.conflictIndex = utils.Clamp(index, 0, len(s.conflicts)-1) s.conflictIndex = lo.Clamp(index, 0, len(s.conflicts)-1)
} }
s.setSelectionIndex(s.selectionIndex) s.setSelectionIndex(s.selectionIndex)
} }
func (s *State) setSelectionIndex(index int) { func (s *State) setSelectionIndex(index int) {
if selections := s.availableSelections(); len(selections) != 0 { if selections := s.availableSelections(); len(selections) != 0 {
s.selectionIndex = utils.Clamp(index, 0, len(selections)-1) s.selectionIndex = lo.Clamp(index, 0, len(selections)-1)
} }
} }

9
pkg/utils/utils.go
View file

@ -39,15 +39,6 @@ func SortRange(x int, y int) (int, int) {
return y, x return y, x
} }
func Clamp(x int, min int, max int) int {
if x < min {
return min
} else if x > max {
return max
}
return x
}
func AsJson(i interface{}) string { func AsJson(i interface{}) string {
bytes, _ := json.MarshalIndent(i, "", " ") bytes, _ := json.MarshalIndent(i, "", " ")
return string(bytes) return string(bytes)