mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-07-30 03:23:08 +03:00
Clear range select upon pressing 'escape'
This is the highest priority of the escape actions because it's the thing you're most likely to want to do upon hitting escape if you have a range selected. Applying this to the staging/patch-building views is tricky: if we want this logic for when a range of lines is selected, we'll also need to apply it when a hunk is selected too. I still think it's worth it though: I've often accidentally escaped from the staging view when trying to cancel a range selection.
This commit is contained in:
@ -88,6 +88,9 @@ var SpecificSelection = NewIntegrationTest(NewIntegrationTestArgs{
|
||||
Contains(" 1f"),
|
||||
)
|
||||
}).
|
||||
// Cancel hunk select
|
||||
PressEscape().
|
||||
// Escape the view
|
||||
PressEscape()
|
||||
|
||||
t.Views().CommitFiles().
|
||||
@ -97,11 +100,6 @@ var SpecificSelection = NewIntegrationTest(NewIntegrationTestArgs{
|
||||
|
||||
t.Views().PatchBuilding().
|
||||
IsFocused().
|
||||
// hunk is selected because selection mode persists across files
|
||||
ContainsLines(
|
||||
Contains("@@ -0,0 +1,26 @@").IsSelected(),
|
||||
).
|
||||
Press(keys.Main.ToggleSelectHunk).
|
||||
SelectedLines(
|
||||
Contains("+2a"),
|
||||
).
|
||||
|
@ -12,9 +12,11 @@ import (
|
||||
// (no range, press arrow) -> no range
|
||||
// (no range, press shift+arrow) -> nonsticky range
|
||||
// (sticky range, press 'v') -> no range
|
||||
// (sticky range, press 'escape') -> no range
|
||||
// (sticky range, press arrow) -> sticky range
|
||||
// (sticky range, press shift+arrow) -> nonsticky range
|
||||
// (nonsticky range, press 'v') -> no range
|
||||
// (nonsticky range, press 'escape') -> no range
|
||||
// (nonsticky range, press arrow) -> no range
|
||||
// (nonsticky range, press shift+arrow) -> nonsticky range
|
||||
|
||||
@ -125,6 +127,30 @@ var RangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
|
||||
Press(keys.Universal.ToggleRangeSelect).
|
||||
SelectedLines(
|
||||
Contains("line 7"),
|
||||
).
|
||||
Press(keys.Universal.RangeSelectDown).
|
||||
SelectedLines(
|
||||
Contains("line 7"),
|
||||
Contains("line 8"),
|
||||
).
|
||||
// (nonsticky range, press 'escape') -> no range
|
||||
PressEscape().
|
||||
SelectedLines(
|
||||
Contains("line 8"),
|
||||
).
|
||||
Press(keys.Universal.ToggleRangeSelect).
|
||||
SelectedLines(
|
||||
Contains("line 8"),
|
||||
).
|
||||
SelectNextItem().
|
||||
SelectedLines(
|
||||
Contains("line 8"),
|
||||
Contains("line 9"),
|
||||
).
|
||||
// (sticky range, press 'escape') -> no range
|
||||
PressEscape().
|
||||
SelectedLines(
|
||||
Contains("line 9"),
|
||||
)
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user