Skip to content

Fix crash with drag selecting and staging #4480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 13, 2025
Merged

Fix crash with drag selecting and staging #4480

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3ae1c8
Refactor: extract function clampLineIdx
stefanhaller Apr 11, 2025
825e5c2
Fix crash when dragging from below the end of the diff upwards and th…
stefanhaller Apr 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions pkg/gui/patch_exploring/state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"github.com/jesseduffield/gocui"
"github.com/jesseduffield/lazygit/pkg/commands/patch"
"github.com/jesseduffield/lazygit/pkg/utils"
"github.com/samber/lo"
)

// State represents the current state of the patch explorer context i.e. when
Expand Down Expand Up @@ -177,19 +178,17 @@ func (s *State) SelectLine(newSelectedLineIdx int) {
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
func (s *State) selectLineWithoutRangeCheck(newSelectedLineIdx int) {
if newSelectedLineIdx < 0 {
newSelectedLineIdx = 0
} else if newSelectedLineIdx > len(s.patchLineIndices)-1 {
newSelectedLineIdx = len(s.patchLineIndices) - 1
}

s.selectedLineIdx = newSelectedLineIdx
s.selectedLineIdx = s.clampLineIdx(newSelectedLineIdx)
}

func (s *State) SelectNewLineForRange(newSelectedLineIdx int) {
s.rangeStartLineIdx = newSelectedLineIdx
s.rangeStartLineIdx = s.clampLineIdx(newSelectedLineIdx)

s.selectMode = RANGE

Expand Down