Allow clicking in focused main view (or pressing enter) to go to staging

stefanhaller · stefanhaller · commit 6d905fb02ebe · 2025-03-26T16:42:51.000+01:00
Only works if a file is selected.
diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md
@@ -209,6 +209,7 @@ If you would instead like to start an interactive rebase from the selected commi
 | `` mouse wheel up (fn+down) `` | Scroll up |  |
 | `` <tab> `` | Switch view | Switch to other view (staged/unstaged changes). |
 | `` <esc> `` | Exit back to side panel |  |
+| `` <enter> `` | Enter staging/patch building |  |
 | `` / `` | Search the current view by text |  |
 
 ## Main panel (patch building)
@@ -310,6 +311,7 @@ If you would instead like to start an interactive rebase from the selected commi
 |-----|--------|-------------|
 | `` <tab> `` | Switch view | Switch to other view (staged/unstaged changes). |
 | `` <esc> `` | Exit back to side panel |  |
+| `` <enter> `` | Enter staging/patch building |  |
 | `` / `` | Search the current view by text |  |
 
 ## Stash
diff --git a/docs/keybindings/Keybindings_ja.md b/docs/keybindings/Keybindings_ja.md
@@ -57,6 +57,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 |-----|--------|-------------|
 | `` <tab> `` | パネルを切り替え | Switch to other view (staged/unstaged changes). |
 | `` <esc> `` | Exit back to side panel |  |
+| `` <enter> `` | Enter staging/patch building |  |
 | `` / `` | 検索を開始 |  |
 
 ## Stash
@@ -292,6 +293,7 @@ If you would instead like to start an interactive rebase from the selected commi
 | `` mouse wheel up (fn+down) `` | 上にスクロール |  |
 | `` <tab> `` | パネルを切り替え | Switch to other view (staged/unstaged changes). |
 | `` <esc> `` | Exit back to side panel |  |
+| `` <enter> `` | Enter staging/patch building |  |
 | `` / `` | 検索を開始 |  |
 
 ## メインパネル (Patch Building)
diff --git a/docs/keybindings/Keybindings_ko.md b/docs/keybindings/Keybindings_ko.md
@@ -75,6 +75,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 |-----|--------|-------------|
 | `` <tab> `` | 패널 전환 | Switch to other view (staged/unstaged changes). |
 | `` <esc> `` | Exit back to side panel |  |
+| `` <enter> `` | Enter staging/patch building |  |
 | `` / `` | 검색 시작 |  |
 
 ## Stash
@@ -151,6 +152,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 | `` mouse wheel up (fn+down) `` | 위로 스크롤 |  |
 | `` <tab> `` | 패널 전환 | Switch to other view (staged/unstaged changes). |
 | `` <esc> `` | Exit back to side panel |  |
+| `` <enter> `` | Enter staging/patch building |  |
 | `` / `` | 검색 시작 |  |
 
 ## 메인 패널 (Patch Building)
diff --git a/docs/keybindings/Keybindings_nl.md b/docs/keybindings/Keybindings_nl.md
@@ -217,6 +217,7 @@ If you would instead like to start an interactive rebase from the selected commi
 | `` mouse wheel up (fn+down) `` | Scroll omhoog |  |
 | `` <tab> `` | Ga naar een ander paneel | Switch to other view (staged/unstaged changes). |
 | `` <esc> `` | Exit back to side panel |  |
+| `` <enter> `` | Enter staging/patch building |  |
 | `` / `` | Start met zoeken |  |
 
 ## Patch bouwen
@@ -288,6 +289,7 @@ If you would instead like to start an interactive rebase from the selected commi
 |-----|--------|-------------|
 | `` <tab> `` | Ga naar een ander paneel | Switch to other view (staged/unstaged changes). |
 | `` <esc> `` | Exit back to side panel |  |
+| `` <enter> `` | Enter staging/patch building |  |
 | `` / `` | Start met zoeken |  |
 
 ## Staging
diff --git a/docs/keybindings/Keybindings_pl.md b/docs/keybindings/Keybindings_pl.md
@@ -96,6 +96,7 @@ Jeśli chcesz zamiast tego rozpocząć interaktywny rebase od wybranego commita,
 |-----|--------|-------------|
 | `` <tab> `` | Przełącz widok | Przełącz na inny widok (zatwierdzone/niezatwierdzone zmiany). |
 | `` <esc> `` | Exit back to side panel |  |
+| `` <enter> `` | Enter staging/patch building |  |
 | `` / `` | Szukaj w bieżącym widoku po tekście |  |
 
 ## Drzewa pracy
@@ -167,6 +168,7 @@ Jeśli chcesz zamiast tego rozpocząć interaktywny rebase od wybranego commita,
 | `` mouse wheel up (fn+down) `` | Przewiń w górę |  |
 | `` <tab> `` | Przełącz widok | Przełącz na inny widok (zatwierdzone/niezatwierdzone zmiany). |
 | `` <esc> `` | Exit back to side panel |  |
+| `` <enter> `` | Enter staging/patch building |  |
 | `` / `` | Szukaj w bieżącym widoku po tekście |  |
 
 ## Panel główny (scalanie)
diff --git a/docs/keybindings/Keybindings_pt.md b/docs/keybindings/Keybindings_pt.md
@@ -231,6 +231,7 @@ If you would instead like to start an interactive rebase from the selected commi
 | `` mouse wheel up (fn+down) `` | Scroll up |  |
 | `` <tab> `` | Mudar de visão | Alternar para outra visão (staged/não processadas alterações). |
 | `` <esc> `` | Exit back to side panel |  |
+| `` <enter> `` | Enter staging/patch building |  |
 | `` / `` | Search the current view by text |  |
 
 ## Painel Principal (preparação)
@@ -323,6 +324,7 @@ Veja a documentação:
 |-----|--------|-------------|
 | `` <tab> `` | Mudar de visão | Alternar para outra visão (staged/não processadas alterações). |
 | `` <esc> `` | Exit back to side panel |  |
+| `` <enter> `` | Enter staging/patch building |  |
 | `` / `` | Search the current view by text |  |
 
 ## Stash
diff --git a/docs/keybindings/Keybindings_ru.md b/docs/keybindings/Keybindings_ru.md
@@ -67,6 +67,7 @@ _Связки клавиш_
 |-----|--------|-------------|
 | `` <tab> `` | Переключиться на другую панель (проиндексированные/непроиндексированные изменения) | Switch to other view (staged/unstaged changes). |
 | `` <esc> `` | Exit back to side panel |  |
+| `` <enter> `` | Enter staging/patch building |  |
 | `` / `` | Найти |  |
 
 ## Главная панель (Индексирование)
@@ -99,6 +100,7 @@ _Связки клавиш_
 | `` mouse wheel up (fn+down) `` | Прокрутить вверх |  |
 | `` <tab> `` | Переключиться на другую панель (проиндексированные/непроиндексированные изменения) | Switch to other view (staged/unstaged changes). |
 | `` <esc> `` | Exit back to side panel |  |
+| `` <enter> `` | Enter staging/patch building |  |
 | `` / `` | Найти |  |
 
 ## Главная панель (Слияние)
diff --git a/docs/keybindings/Keybindings_zh-CN.md b/docs/keybindings/Keybindings_zh-CN.md
@@ -275,6 +275,7 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 |-----|--------|-------------|
 | `` <tab> `` | 切换到其他面板 | 切换到其他视图（已暂存/未暂存的变更） |
 | `` <esc> `` | Exit back to side panel |  |
+| `` <enter> `` | Enter staging/patch building |  |
 | `` / `` | 开始搜索 |  |
 
 ## 正在合并
@@ -323,6 +324,7 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
 | `` mouse wheel up (fn+down) `` | 向上滚动 |  |
 | `` <tab> `` | 切换到其他面板 | 切换到其他视图（已暂存/未暂存的变更） |
 | `` <esc> `` | Exit back to side panel |  |
+| `` <enter> `` | Enter staging/patch building |  |
 | `` / `` | 开始搜索 |  |
 
 ## 状态
diff --git a/docs/keybindings/Keybindings_zh-TW.md b/docs/keybindings/Keybindings_zh-TW.md
@@ -74,6 +74,7 @@ _說明：`<c-b>` 表示 Ctrl＋B、`<a-b>` 表示 Alt＋B，`B`表示 Shift＋B
 | `` mouse wheel up (fn+down) `` | 向上捲動 |  |
 | `` <tab> `` | 切換至另一個面板 (已預存/未預存更改) | Switch to other view (staged/unstaged changes). |
 | `` <esc> `` | Exit back to side panel |  |
+| `` <enter> `` | Enter staging/patch building |  |
 | `` / `` | 搜尋 |  |
 
 ## 主面板（合併）
@@ -345,6 +346,7 @@ If you would instead like to start an interactive rebase from the selected commi
 |-----|--------|-------------|
 | `` <tab> `` | 切換至另一個面板 (已預存/未預存更改) | Switch to other view (staged/unstaged changes). |
 | `` <esc> `` | Exit back to side panel |  |
+| `` <enter> `` | Enter staging/patch building |  |
 | `` / `` | 搜尋 |  |
 
 ## 狀態
diff --git a/pkg/gui/context/base_context.go b/pkg/gui/context/base_context.go
@@ -13,12 +13,13 @@ type BaseContext struct {
 	windowName      string
 	onGetOptionsMap func() map[string]string
 
-	keybindingsFns      []types.KeybindingsFn
-	mouseKeybindingsFns []types.MouseKeybindingsFn
-	onClickFn           func() error
-	onRenderToMainFn    func()
-	onFocusFn           onFocusFn
-	onFocusLostFn       onFocusLostFn
+	keybindingsFns           []types.KeybindingsFn
+	mouseKeybindingsFns      []types.MouseKeybindingsFn
+	onClickFn                func() error
+	onClickFocusedMainViewFn onClickFocusedMainViewFn
+	onRenderToMainFn         func()
+	onFocusFn                onFocusFn
+	onFocusLostFn            onFocusLostFn
 
 	focusable                   bool
 	transient                   bool
@@ -31,8 +32,9 @@ type BaseContext struct {
 }
 
 type (
-	onFocusFn     = func(types.OnFocusOpts)
-	onFocusLostFn = func(types.OnFocusLostOpts)
+	onFocusFn                = func(types.OnFocusOpts)
+	onFocusLostFn            = func(types.OnFocusLostOpts)
+	onClickFocusedMainViewFn = func(mainViewName string, clickedLineIdx int) error
 )
 
 var _ types.IBaseContext = &BaseContext{}
@@ -144,10 +146,20 @@ func (self *BaseContext) AddOnClickFn(fn func() error) {
 	}
 }
 
+func (self *BaseContext) AddOnClickFocusedMainViewFn(fn onClickFocusedMainViewFn) {
+	if fn != nil {
+		self.onClickFocusedMainViewFn = fn
+	}
+}
+
 func (self *BaseContext) GetOnClick() func() error {
 	return self.onClickFn
 }
 
+func (self *BaseContext) GetOnClickFocusedMainView() onClickFocusedMainViewFn {
+	return self.onClickFocusedMainViewFn
+}
+
 func (self *BaseContext) AddOnRenderToMainFn(fn func()) {
 	if fn != nil {
 		self.onRenderToMainFn = fn
diff --git a/pkg/gui/controllers/attach.go b/pkg/gui/controllers/attach.go
@@ -7,6 +7,7 @@ func AttachControllers(context types.Context, controllers ...types.IController)
 		context.AddKeybindingsFn(controller.GetKeybindings)
 		context.AddMouseKeybindingsFn(controller.GetMouseKeybindings)
 		context.AddOnClickFn(controller.GetOnClick())
+		context.AddOnClickFocusedMainViewFn(controller.GetOnClickFocusedMainView())
 		context.AddOnRenderToMainFn(controller.GetOnRenderToMain())
 		context.AddOnFocusFn(controller.GetOnFocus())
 		context.AddOnFocusLostFn(controller.GetOnFocusLost())
diff --git a/pkg/gui/controllers/base_controller.go b/pkg/gui/controllers/base_controller.go
@@ -19,6 +19,10 @@ func (self *baseController) GetOnClick() func() error {
 	return nil
 }
 
+func (self *baseController) GetOnClickFocusedMainView() func(mainViewName string, clickedLineIdx int) error {
+	return nil
+}
+
 func (self *baseController) GetOnRenderToMain() func() {
 	return nil
 }
diff --git a/pkg/gui/controllers/commits_files_controller.go b/pkg/gui/controllers/commits_files_controller.go
@@ -531,6 +531,16 @@ func (self *CommitFilesController) expandAll() error {
 	return nil
 }
 
+func (self *CommitFilesController) GetOnClickFocusedMainView() func(mainViewName string, clickedLineIdx int) error {
+	return func(mainViewName string, clickedLineIdx int) error {
+		node := self.getSelectedItem()
+		if node != nil && node.File != nil {
+			return self.enterCommitFile(node, types.OnFocusOpts{ClickedWindowName: mainViewName, ClickedViewLineIdx: clickedLineIdx})
+		}
+		return nil
+	}
+}
+
 // NOTE: these functions are identical to those in files_controller.go (except for types) and
 // could also be cleaned up with some generics
 func normalisedSelectedCommitFileNodes(selectedNodes []*filetree.CommitFileNode) []*filetree.CommitFileNode {
diff --git a/pkg/gui/controllers/files_controller.go b/pkg/gui/controllers/files_controller.go
@@ -290,6 +290,16 @@ func (self *FilesController) GetOnClick() func() error {
 	})
 }
 
+func (self *FilesController) GetOnClickFocusedMainView() func(mainViewName string, clickedLineIdx int) error {
+	return func(mainViewName string, clickedLineIdx int) error {
+		node := self.getSelectedItem()
+		if node != nil && node.File != nil {
+			return self.EnterFile(types.OnFocusOpts{ClickedWindowName: mainViewName, ClickedViewLineIdx: clickedLineIdx})
+		}
+		return nil
+	}
+}
+
 // if we are dealing with a status for which there is no key in this map,
 // then we won't optimistically render: we'll just let `git status` tell
 // us what the new status is.
@@ -512,7 +522,8 @@ func (self *FilesController) EnterFile(opts types.OnFocusOpts) error {
 		return errors.New(self.c.Tr.FileStagingRequirements)
 	}
 
-	self.c.Context().Push(self.c.Contexts().Staging, opts)
+	context := lo.Ternary(opts.ClickedWindowName == "secondary", self.c.Contexts().StagingSecondary, self.c.Contexts().Staging)
+	self.c.Context().Push(context, opts)
 	return nil
 }
 
diff --git a/pkg/gui/controllers/main_view_controller.go b/pkg/gui/controllers/main_view_controller.go
@@ -1,6 +1,7 @@
 package controllers
 
 import (
+	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )
 
@@ -41,6 +42,21 @@ func (self *MainViewController) GetKeybindings(opts types.KeybindingsOpts) []*ty
 			Handler:     self.escape,
 			Description: self.c.Tr.ExitFocusedMainView,
 		},
+		{
+			Key:         opts.GetKey(opts.Config.Universal.GoInto),
+			Handler:     self.enter,
+			Description: self.c.Tr.EnterStaging,
+		},
+	}
+}
+
+func (self *MainViewController) GetMouseKeybindings(opts types.KeybindingsOpts) []*gocui.ViewMouseBinding {
+	return []*gocui.ViewMouseBinding{
+		{
+			ViewName: self.context.GetViewName(),
+			Key:      gocui.MouseLeft,
+			Handler:  self.onClick,
+		},
 	}
 }
 
@@ -58,6 +74,7 @@ func (self *MainViewController) GetOnFocus() func(types.OnFocusOpts) {
 
 func (self *MainViewController) togglePanel() error {
 	if self.otherContext.GetView().Visible {
+		self.otherContext.SetParentContext(self.context.GetParentContext())
 		self.c.Context().Push(self.otherContext)
 	}
 
@@ -68,3 +85,23 @@ func (self *MainViewController) escape() error {
 	self.c.Context().Pop()
 	return nil
 }
+
+func (self *MainViewController) enter() error {
+	parentCtx := self.context.GetParentContext()
+	if parentCtx.GetOnClickFocusedMainView() != nil {
+		return parentCtx.GetOnClickFocusedMainView()(self.context.GetViewName(), self.context.GetView().SelectedLineIdx())
+	}
+	return nil
+}
+
+func (self *MainViewController) onClick(opts gocui.ViewMouseBindingOpts) error {
+	if opts.Y != opts.PreviousY {
+		return nil
+	}
+
+	parentCtx := self.context.GetParentContext()
+	if parentCtx.GetOnClickFocusedMainView() != nil {
+		return parentCtx.GetOnClickFocusedMainView()(self.context.GetViewName(), opts.Y)
+	}
+	return nil
+}
diff --git a/pkg/gui/types/context.go b/pkg/gui/types/context.go
@@ -94,6 +94,9 @@ type IBaseContext interface {
 	// our list controller can come along and wrap it in a list-specific click handler.
 	// We'll need to think of a better way to do this.
 	AddOnClickFn(func() error)
+	// Likewise for the focused main view: we need this to communicate between a
+	// side panel controller and the focused main view controller.
+	AddOnClickFocusedMainViewFn(func(mainViewName string, clickedLineIdx int) error)
 
 	AddOnRenderToMainFn(func())
 	AddOnFocusFn(func(OnFocusOpts))
@@ -240,6 +243,7 @@ type HasKeybindings interface {
 	GetKeybindings(opts KeybindingsOpts) []*Binding
 	GetMouseKeybindings(opts KeybindingsOpts) []*gocui.ViewMouseBinding
 	GetOnClick() func() error
+	GetOnClickFocusedMainView() func(mainViewName string, clickedLineIdx int) error
 	GetOnRenderToMain() func()
 	GetOnFocus() func(OnFocusOpts)
 	GetOnFocusLost() func(OnFocusLostOpts)
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go
@@ -486,6 +486,7 @@ type TranslationSet struct {
 	EmptyPatchError                       string
 	EnterCommitFile                       string
 	EnterCommitFileTooltip                string
+	EnterStaging                          string
 	ExitCustomPatchBuilder                string
 	ExitFocusedMainView                   string
 	EnterUpstream                         string
@@ -1536,6 +1537,7 @@ func EnglishTranslationSet() *TranslationSet {
 		EmptyPatchError:                      "Patch is still empty. Add some files or lines to your patch first.",
 		EnterCommitFile:                      "Enter file / Toggle directory collapsed",
 		EnterCommitFileTooltip:               "If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory.",
+		EnterStaging:                         "Enter staging/patch building",
 		ExitCustomPatchBuilder:               `Exit custom patch builder`,
 		ExitFocusedMainView:                  "Exit back to side panel",
 		EnterUpstream:                        `Enter upstream as '<remote> <branchname>'`,
