go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-29 23:17:32 +02:00
Code Issues Releases Activity

Fix pressing shift-down after clicking in diff view

Browse Source 
When clicking in a single-file diff view to enter staging (or custom patch
editing, when coming from the commit files panel), and then pressing shift-down
or shift-up to select a range, it would move the selected line rather than
creating a range. Only on the next press would it start to select a range from
there.

This is very similar to the fix we made for pressing escape in 0e4d266a52.
This commit is contained in:
Stefan Haller 2024-10-17 10:59:53 +02:00
parent 7655f6864e
commit a58770ee1b
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/gui/patch_exploring/state.go
View File

@ -94,7 +94,7 @@ func (s *State) ToggleStickySelectRange() {
} }
func (s *State) ToggleSelectRange(sticky bool) { func (s *State) ToggleSelectRange(sticky bool) {
if s.selectMode == RANGE { if s.SelectingRange() {
s.selectMode = LINE s.selectMode = LINE
} else { } else {
s.selectMode = RANGE s.selectMode = RANGE

12
pkg/integration/tests/ui/range_select.go
View File

@ -159,19 +159,11 @@ var RangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
SelectedLines( SelectedLines(
Contains("line 1"), Contains("line 1"),
). ).
Press(keys.Universal.RangeSelectDown) Press(keys.Universal.RangeSelectDown).
if lineIdxOfFirstItem == 6 { SelectedLines(
v.SelectedLines(
// bug: it moved to line 2 instead of selecting both line 1 and line 2
Contains("line 2"),
)
} else {
// works correctly in list views though
v.SelectedLines(
Contains("line 1"), Contains("line 1"),
Contains("line 2"), Contains("line 2"),
) )
}
} }
assertRangeSelectBehaviour(t.Views().Commits().Focus(), t.Views().Branches(), 0) assertRangeSelectBehaviour(t.Views().Commits().Focus(), t.Views().Branches(), 0)