Skip to content
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

Jump to bottom

Switch tabs with panel jump keys #3794

Merged
merged 1 commit into from
Aug 17, 2024
+44 −2
Merged

Switch tabs with panel jump keys #3794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion pkg/gui/controllers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ func (gui *Gui) resetHelpersAndControllers() {
commandLogController := controllers.NewCommandLogController(common)
confirmationController := controllers.NewConfirmationController(common)
suggestionsController := controllers.NewSuggestionsController(common)
jumpToSideWindowController := controllers.NewJumpToSideWindowController(common)
jumpToSideWindowController := controllers.NewJumpToSideWindowController(common, gui.handleNextTab)

sideWindowControllerFactory := controllers.NewSideWindowControllerFactory(common)

Expand Down
9 changes: 8 additions & 1 deletion pkg/gui/controllers/jump_to_side_window_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,18 @@ import (

type JumpToSideWindowController struct {
baseController
c *ControllerCommon
c *ControllerCommon
nextTabFunc func() error
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I dislike indirections through function pointers if we can avoid them, as it makes the code harder to read. I would find it cleaner to extract the handleNextTab function to some helper so that we can call it from both places. However, I found this a bit tricky because it depends on some private Gui stuff, and I didn't want to invest more time in this.

}

func NewJumpToSideWindowController(
c *ControllerCommon,
nextTabFunc func() error,
) *JumpToSideWindowController {
return &JumpToSideWindowController{
baseController: baseController{},
c: c,
nextTabFunc: nextTabFunc,
}
}

Expand Down Expand Up @@ -46,6 +49,10 @@ func (self *JumpToSideWindowController) GetKeybindings(opts types.KeybindingsOpt

func (self *JumpToSideWindowController) goToSideWindow(window string) func() error {
return func() error {
if self.c.Helpers().Window.CurrentWindow() == window {
return self.nextTabFunc()
}

context := self.c.Helpers().Window.GetContextForWindow(window)

return self.c.PushContext(context)
Expand Down
1 change: 1 addition & 0 deletions pkg/integration/tests/test_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,7 @@ var tests = []*components.IntegrationTest{
ui.OpenLinkFailure,
ui.RangeSelect,
ui.SwitchTabFromMenu,
ui.SwitchTabWithPanelJumpKeys,
undo.UndoCheckoutAndDrop,
undo.UndoDrop,
worktree.AddFromBranch,
Expand Down
34 changes: 34 additions & 0 deletions pkg/integration/tests/ui/switch_tab_with_panel_jump_keys.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package ui

import (
"github.com/jesseduffield/lazygit/pkg/config"
. "github.com/jesseduffield/lazygit/pkg/integration/components"
)

var SwitchTabWithPanelJumpKeys = NewIntegrationTest(NewIntegrationTestArgs{
Description: "Switch tab with the panel jump keys",
ExtraCmdArgs: []string{},
Skip: false,
SetupConfig: func(config *config.AppConfig) {},
SetupRepo: func(shell *Shell) {
},
Run: func(t *TestDriver, keys config.KeybindingConfig) {
t.Views().Worktrees().Focus().
Press(keys.Universal.JumpToBlock[2])

t.Views().Branches().IsFocused().
Press(keys.Universal.JumpToBlock[2])

t.Views().Remotes().IsFocused().
Press(keys.Universal.JumpToBlock[2])

t.Views().Tags().IsFocused().
Press(keys.Universal.JumpToBlock[2])

t.Views().Branches().IsFocused().
Press(keys.Universal.JumpToBlock[1])

// When jumping to a panel from a different one, keep its current tab:
t.Views().Worktrees().IsFocused()
},
})
Loading