mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-10-05 21:46:49 -04:00
Stefan HallerandClaude Opus 4.8
494b9ce7cf
The focused main view already lets you point at a diff line and act on it (dive into staging, edit it, open it in a PR). This makes it a staging surface in its own right: press space to stage — or unstage — the selected line without diving into the separate staging view. To make that usable, the selection is now shown automatically whenever the main view holds a diff, anchored on the first change line already visible (so the view doesn't jump), rather than being toggled on demand from the middle of the view. That frees space for staging and means there's always a line to act on. Which contexts show a diff is marked by a new types.DiffMainViewContext, because "shows a diff" is the right signal, not "is stageable": reflog shows a diff (its selection drives edit/PR/navigation) but can't be staged, while a branch's log or the status dashboard show no diff and get no selection at all. Staging is delegated to the side panel beneath via a GetOnStageFocusedMainView handler mirroring GetOnClickFocusedMainView, so what "stage" means stays the panel's concern (the working tree stages/unstages; commits will later add to a custom patch). The files handler resolves the line's patch identity from the diff-line metadata, maps it to a patch line, and applies a one-line patch, choosing stage vs unstage from whether the shown diff is the unstaged or staged side (diffSplitState). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
100 lines
2.9 KiB
Go
100 lines
2.9 KiB
Go
package controllers
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/gocui"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/types"
|
|
)
|
|
|
|
// This controller is for all contexts that can focus their main view.
|
|
|
|
var _ types.IController = &SwitchToFocusedMainViewController{}
|
|
|
|
type SwitchToFocusedMainViewController struct {
|
|
baseController
|
|
c *ControllerCommon
|
|
context types.Context
|
|
}
|
|
|
|
func NewSwitchToFocusedMainViewController(
|
|
c *ControllerCommon,
|
|
context types.Context,
|
|
) *SwitchToFocusedMainViewController {
|
|
return &SwitchToFocusedMainViewController{
|
|
baseController: baseController{},
|
|
c: c,
|
|
context: context,
|
|
}
|
|
}
|
|
|
|
func (self *SwitchToFocusedMainViewController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding {
|
|
bindings := []*types.Binding{
|
|
{
|
|
Keys: opts.GetKeys(opts.Config.Universal.FocusMainView),
|
|
Handler: self.handleFocusMainView,
|
|
Description: self.c.Tr.FocusMainView,
|
|
Tag: "global",
|
|
},
|
|
}
|
|
|
|
return bindings
|
|
}
|
|
|
|
func (self *SwitchToFocusedMainViewController) GetMouseKeybindings(opts types.KeybindingsOpts) []*gocui.ViewMouseBinding {
|
|
return []*gocui.ViewMouseBinding{
|
|
{
|
|
ViewName: "main",
|
|
Key: gocui.MouseLeft,
|
|
Handler: self.onClickMain,
|
|
FocusedView: self.context.GetViewName(),
|
|
},
|
|
{
|
|
ViewName: "secondary",
|
|
Key: gocui.MouseLeft,
|
|
Handler: self.onClickSecondary,
|
|
FocusedView: self.context.GetViewName(),
|
|
},
|
|
}
|
|
}
|
|
|
|
func (self *SwitchToFocusedMainViewController) Context() types.Context {
|
|
return self.context
|
|
}
|
|
|
|
func (self *SwitchToFocusedMainViewController) onClickMain(opts gocui.ViewMouseBindingOpts) error {
|
|
return self.focusMainView(self.c.Contexts().Normal, opts.Y)
|
|
}
|
|
|
|
func (self *SwitchToFocusedMainViewController) onClickSecondary(opts gocui.ViewMouseBindingOpts) error {
|
|
return self.focusMainView(self.c.Contexts().NormalSecondary, opts.Y)
|
|
}
|
|
|
|
func (self *SwitchToFocusedMainViewController) handleFocusMainView() error {
|
|
// Focusing by keyboard doesn't point at any particular line: in a diff view
|
|
// we start at the first change block (like entering the staging view), in a
|
|
// non-diff view we show no selection and the user just scrolls. Clicking does
|
|
// point at a line, so it selects that line instead (focusMainView's
|
|
// clickedLineIdx).
|
|
return self.focusMainView(self.c.Contexts().Normal, -1)
|
|
}
|
|
|
|
func (self *SwitchToFocusedMainViewController) focusMainView(mainViewContext types.Context, clickedLineIdx int) error {
|
|
if context, ok := mainViewContext.(types.ISearchableContext); ok {
|
|
context.ClearSearchString()
|
|
}
|
|
self.c.Context().Push(mainViewContext, types.OnFocusOpts{})
|
|
|
|
if !sidePanelShowsDiff(self.context) {
|
|
// Non-diff main content (e.g. a branch's commit log): focus only, no
|
|
// selection, since there's nothing to act on.
|
|
return nil
|
|
}
|
|
|
|
view := mainViewContext.GetView()
|
|
if clickedLineIdx >= 0 {
|
|
showSelectionAtLine(view, clickedLineIdx, false)
|
|
} else {
|
|
showInitialDiffSelection(self.c, view)
|
|
}
|
|
return nil
|
|
}
|