mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-12 08:36:25 -04:00
4b57cc9efe
Step 1 made the focused main view a staging surface for a single line. This adds the range and hunk selection the staging view has, so you can stage (or unstage) a range or a whole hunk in place — `v` starts a range, shift-up/down extend one, `a` toggles hunk selection — without diving into the staging view. The selection mode (line / range / hunk, plus sticky-range and "the user turned hunk mode on themselves") lives on MainContext rather than the controller, because three places need a pane's mode: the main view controller that drives it, the focus controller that resets it when you focus the view, and togglePanel which sets it on the *other* pane. The selected line and the range anchor stay in the gocui view itself (its cursor and rangeSelectStartY), so the existing native range-select rendering draws the highlight — no new highlight machinery. Hunk bounds come from the diff-line metadata (the isChange run around the cursor, via ChangeBlockBounds), not from a parsed patch, so they work over any conforming rendering. The up/down keys are mode-aware: hunk mode steps hunk to hunk, a non-sticky range collapses on a plain move, a sticky range extends. GetOnStageFocusedMainView now takes the selected view-line range instead of one line; the files handler collects the change lines in the range and applies a single patch. It identifies each change line's patch line by scanning the parsed patch and matching (file line number, deletion?) identities, rather than looking each number up with PatchLineForLineNumber. That lookup can't tell an addition at the very start of a hunk from the deletion above it, nor an addition from the deletion it replaces on a modified line — both of which a range routinely spans. As a side effect this also fixes staging a change on the first line of a file. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
79 lines
2.3 KiB
Go
79 lines
2.3 KiB
Go
package context
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/gocui"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/types"
|
|
)
|
|
|
|
type MainContext struct {
|
|
*SimpleContext
|
|
*SearchTrait
|
|
|
|
diffSelect DiffSelectState
|
|
}
|
|
|
|
var _ types.ISearchableContext = (*MainContext)(nil)
|
|
|
|
// DiffSelectMode is how the focused main view's diff selection extends from the
|
|
// cursor: a single line, a range from a fixed anchor, or the change block (hunk)
|
|
// around the cursor.
|
|
type DiffSelectMode int
|
|
|
|
const (
|
|
DiffSelectModeLine DiffSelectMode = iota
|
|
DiffSelectModeRange
|
|
DiffSelectModeHunk
|
|
)
|
|
|
|
// DiffSelectState holds the *mode* of the focused main view's diff selection. The
|
|
// selected line and the range anchor themselves live in the gocui view (its
|
|
// cursor and rangeSelectStartY, i.e. native range select); only the mode lives
|
|
// here. It's on the context, not the controller, so that the main view controller
|
|
// (which drives the selection), the focus controller (which resets it on focus),
|
|
// and togglePanel (which sets it on the other pane) can all reach it via the
|
|
// context they already hold.
|
|
type DiffSelectState struct {
|
|
Mode DiffSelectMode
|
|
// When a range is sticky, moving the cursor without holding shift extends the
|
|
// range; otherwise it collapses the range back to a single line.
|
|
RangeIsSticky bool
|
|
// Whether the user turned on hunk mode explicitly, as opposed to it being the
|
|
// configured default; this decides whether escape leaves hunk mode.
|
|
UserEnabledHunkMode bool
|
|
}
|
|
|
|
// DiffSelectState returns the focused main view's selection mode state, for the
|
|
// controllers to read and mutate directly.
|
|
func (self *MainContext) DiffSelectState() *DiffSelectState {
|
|
return &self.diffSelect
|
|
}
|
|
|
|
func NewMainContext(
|
|
view *gocui.View,
|
|
windowName string,
|
|
key types.ContextKey,
|
|
c *ContextCommon,
|
|
) *MainContext {
|
|
ctx := &MainContext{
|
|
SimpleContext: NewSimpleContext(
|
|
NewBaseContext(NewBaseContextOpts{
|
|
Kind: types.MAIN_CONTEXT,
|
|
View: view,
|
|
WindowName: windowName,
|
|
Key: key,
|
|
Focusable: true,
|
|
HighlightOnFocus: false,
|
|
})),
|
|
SearchTrait: NewSearchTrait(c),
|
|
}
|
|
|
|
return ctx
|
|
}
|
|
|
|
func (self *MainContext) ModelSearchResults(searchStr string, caseSensitive bool) []gocui.SearchPosition {
|
|
return nil
|
|
}
|
|
|
|
func (self *MainContext) OnSearchSelect(int) {
|
|
}
|