utils-code/jesseduffield.lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-09-10 23:56:24 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Keep hunk mode when clicking another hunk in the focused main view

Browse source 
Once in hunk mode, clicking another change line reset the selection to a
single line, so you had to press `a` again for each block you wanted to
stage (a behaviour the main view inherited from the staging and patch-
building panels). Preserve hunk mode across clicks instead: a click on a
change line re-selects that whole block, while a click on context — or any
click when we weren't in hunk mode — drops to a single line, where the click
points precisely (e.g. to edit it).

The two click handlers shared an identical selection body, so unify them
into one helper and make the change in a single place.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Stefan Haller 2026-06-20 16:07:05 +02:00
parent 8395658e75
commit d80802c1f9
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
pkg/gui/controllers/main_view_controller.go
View file

@ -969,17 +969,7 @@ func githubPullRequestLineURL(prURL string, commitSha string, relativePath strin
}
func (self *MainViewController) onClickInAlreadyFocusedView(opts gocui.ViewMouseBindingOpts) error {
if !self.isDiffView() {
return nil
}
// A click points at a line, so it sets a single-line selection there; a
// double-click additionally dives into staging/patch-building for that line.
resetDiffSelectMode(self.context)
showSelectionAtLine(self.context.GetView(), opts.Y, false)
if opts.IsDoubleClick {
return self.enterForLine(opts.Y)
}
return nil
return self.selectClickedDiffLine(opts)
}
func (self *MainViewController) editClickedLine(opts gocui.ViewMouseBindingOpts) error {
@ -988,11 +978,26 @@ func (self *MainViewController) editClickedLine(opts gocui.ViewMouseBindingOpts)
func (self *MainViewController) onClickInOtherViewOfMainViewPair(opts gocui.ViewMouseBindingOpts) error {
self.c.Context().Push(self.context, types.OnFocusOpts{})
return self.selectClickedDiffLine(opts)
}
// selectClickedDiffLine sets the focused main view's selection from a click at view
// line opts.Y. In hunk mode a click on a change line keeps hunk mode and selects that
// whole block, so clicking from hunk to hunk stays ready to stage; a click on context
// drops to a single line, as does any click when we weren't in hunk mode — the click
// points at the line precisely (e.g. to edit it). A double-click additionally dives
// into staging/patch-building for that line.
func (self *MainViewController) selectClickedDiffLine(opts gocui.ViewMouseBindingOpts) error {
if !self.isDiffView() {
return nil
}
resetDiffSelectMode(self.context)
showSelectionAtLine(self.context.GetView(), opts.Y, false)
view := self.context.GetView()
if self.sel().Mode == context.DiffSelectModeHunk && self.c.Helpers().Staging.IsChangeLine(view, opts.Y) {
self.selectHunkAround(opts.Y)
} else {
resetDiffSelectMode(self.context)
showSelectionAtLine(view, opts.Y, false)
}
if opts.IsDoubleClick {
return self.enterForLine(opts.Y)
}