1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-07 01:09:45 +02:00

Move to next stageable line after adding a line to a custom patch

While it's true that the behavior is a little different from the staging panel,
where the staged lines are actually removed from the view and in many cases the
selection stays more or less in the same place, it is still very useful to move
to the next stageable thing in the custom patch building view too.
This commit is contained in:
Stefan Haller
2025-07-01 17:48:00 +02:00
parent 11196f279e
commit 27ce820442
4 changed files with 30 additions and 12 deletions

View File

@ -155,6 +155,8 @@ func (self *PatchBuildingController) toggleSelection() error {
state.SetLineSelectMode() state.SetLineSelectMode()
} }
state.SelectNextStageableLine()
return nil return nil
} }

View File

@ -324,3 +324,9 @@ func wrapPatchLines(diff string, view *gocui.View) ([]int, []int) {
view.Wrap, view.Editable, strings.TrimSuffix(diff, "\n"), view.InnerWidth(), view.TabWidth) view.Wrap, view.Editable, strings.TrimSuffix(diff, "\n"), view.InnerWidth(), view.TabWidth)
return viewLineIndices, patchLineIndices return viewLineIndices, patchLineIndices
} }
func (s *State) SelectNextStageableLine() {
_, lastLineIdx := s.SelectedPatchRange()
patchLineIdx := s.patch.GetNextChangeIdx(lastLineIdx + 1)
s.SelectLine(s.viewLineIndices[patchLineIdx])
}

View File

@ -48,7 +48,6 @@ var MoveToIndexPartial = NewIntegrationTest(NewIntegrationTestArgs{
Contains(`+third line2`), Contains(`+third line2`),
). ).
PressPrimaryAction(). PressPrimaryAction().
SelectNextItem().
PressPrimaryAction(). PressPrimaryAction().
Tap(func() { Tap(func() {
t.Views().Information().Content(Contains("Building patch")) t.Views().Information().Content(Contains("Building patch"))

View File

@ -66,18 +66,20 @@ var SpecificSelection = NewIntegrationTest(NewIntegrationTestArgs{
Contains(` 1f`), Contains(` 1f`),
). ).
PressPrimaryAction(). PressPrimaryAction().
// unlike in the staging panel, we don't remove lines from the patch building panel
// upon 'adding' them. So the same lines will be selected
SelectedLines( SelectedLines(
Contains(`@@ -1,6 +1,6 @@`), Contains(`@@ -17,9 +17,9 @@`),
Contains(`-1a`), Contains(` 1q`),
Contains(`+aa`), Contains(` 1r`),
Contains(` 1b`), Contains(` 1s`),
Contains(`-1c`), Contains(`-1t`),
Contains(`+cc`), Contains(`-1u`),
Contains(` 1d`), Contains(`-1v`),
Contains(` 1e`), Contains(`+tt`),
Contains(` 1f`), Contains(`+uu`),
Contains(`+vv`),
Contains(` 1w`),
Contains(` 1x`),
Contains(` 1y`),
). ).
Tap(func() { Tap(func() {
t.Views().Information().Content(Contains("Building patch")) t.Views().Information().Content(Contains("Building patch"))
@ -106,12 +108,21 @@ var SpecificSelection = NewIntegrationTest(NewIntegrationTestArgs{
Contains("+2a"), Contains("+2a"),
). ).
PressPrimaryAction(). PressPrimaryAction().
SelectedLines(
Contains("+2b"),
).
NavigateToLine(Contains("+2c")). NavigateToLine(Contains("+2c")).
Press(keys.Universal.ToggleRangeSelect). Press(keys.Universal.ToggleRangeSelect).
NavigateToLine(Contains("+2e")). NavigateToLine(Contains("+2e")).
PressPrimaryAction(). PressPrimaryAction().
SelectedLines(
Contains("+2f"),
).
NavigateToLine(Contains("+2g")). NavigateToLine(Contains("+2g")).
PressPrimaryAction(). PressPrimaryAction().
SelectedLines(
Contains("+2h"),
).
Tap(func() { Tap(func() {
t.Views().Information().Content(Contains("Building patch")) t.Views().Information().Content(Contains("Building patch"))