mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-03-23 21:51:07 +02:00
f3eb180f75
We're not fully standardising here: different contexts can store their range state however they like. What we are standardising on is that now the view is always responsible for highlighting the selected lines, meaning the context/controller needs to tell the view where the range start is. Two convenient benefits from this change: 1) we no longer need bespoke code in integration tests for asserting on selected lines because we can just ask the view 2) line selection in staging/patch-building/merge-conflicts views now look the same as in list views i.e. the highlight applies to the whole line (including trailing space) I also noticed a bug with merge conflicts not rendering the selection on focus though I suspect it wasn't a bug with any real consequences when the view wasn't displaying the selection. I'm going to scrap the selectedRangeBgColor config and just let it use the single line background color. Hopefully nobody cares, but there's really no need for an extra config.
122 lines
2.8 KiB
Go
122 lines
2.8 KiB
Go
package context
|
|
|
|
import (
|
|
"math"
|
|
|
|
"github.com/jesseduffield/lazygit/pkg/gui/mergeconflicts"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/types"
|
|
"github.com/sasha-s/go-deadlock"
|
|
)
|
|
|
|
type MergeConflictsContext struct {
|
|
types.Context
|
|
viewModel *ConflictsViewModel
|
|
c *ContextCommon
|
|
mutex *deadlock.Mutex
|
|
}
|
|
|
|
type ConflictsViewModel struct {
|
|
state *mergeconflicts.State
|
|
|
|
// userVerticalScrolling tells us if the user has started scrolling through the file themselves
|
|
// in which case we won't auto-scroll to a conflict.
|
|
userVerticalScrolling bool
|
|
}
|
|
|
|
func NewMergeConflictsContext(
|
|
c *ContextCommon,
|
|
) *MergeConflictsContext {
|
|
viewModel := &ConflictsViewModel{
|
|
state: mergeconflicts.NewState(),
|
|
userVerticalScrolling: false,
|
|
}
|
|
|
|
return &MergeConflictsContext{
|
|
viewModel: viewModel,
|
|
mutex: &deadlock.Mutex{},
|
|
Context: NewSimpleContext(
|
|
NewBaseContext(NewBaseContextOpts{
|
|
Kind: types.MAIN_CONTEXT,
|
|
View: c.Views().MergeConflicts,
|
|
WindowName: "main",
|
|
Key: MERGE_CONFLICTS_CONTEXT_KEY,
|
|
Focusable: true,
|
|
HighlightOnFocus: true,
|
|
}),
|
|
),
|
|
c: c,
|
|
}
|
|
}
|
|
|
|
func (self *MergeConflictsContext) GetState() *mergeconflicts.State {
|
|
return self.viewModel.state
|
|
}
|
|
|
|
func (self *MergeConflictsContext) SetState(state *mergeconflicts.State) {
|
|
self.viewModel.state = state
|
|
}
|
|
|
|
func (self *MergeConflictsContext) GetMutex() *deadlock.Mutex {
|
|
return self.mutex
|
|
}
|
|
|
|
func (self *MergeConflictsContext) SetUserScrolling(isScrolling bool) {
|
|
self.viewModel.userVerticalScrolling = isScrolling
|
|
}
|
|
|
|
func (self *MergeConflictsContext) IsUserScrolling() bool {
|
|
return self.viewModel.userVerticalScrolling
|
|
}
|
|
|
|
func (self *MergeConflictsContext) RenderAndFocus() error {
|
|
self.setContent()
|
|
self.FocusSelection()
|
|
|
|
self.c.Render()
|
|
|
|
return nil
|
|
}
|
|
|
|
func (self *MergeConflictsContext) Render() error {
|
|
self.setContent()
|
|
|
|
self.c.Render()
|
|
|
|
return nil
|
|
}
|
|
|
|
func (self *MergeConflictsContext) GetContentToRender() string {
|
|
if self.GetState() == nil {
|
|
return ""
|
|
}
|
|
|
|
return mergeconflicts.ColoredConflictFile(self.GetState())
|
|
}
|
|
|
|
func (self *MergeConflictsContext) setContent() {
|
|
self.GetView().SetContent(self.GetContentToRender())
|
|
}
|
|
|
|
func (self *MergeConflictsContext) FocusSelection() {
|
|
if !self.IsUserScrolling() {
|
|
_ = self.GetView().SetOriginY(self.GetOriginY())
|
|
}
|
|
|
|
self.SetSelectedLineRange()
|
|
}
|
|
|
|
func (self *MergeConflictsContext) SetSelectedLineRange() {
|
|
startIdx, endIdx := self.GetState().GetSelectedRange()
|
|
view := self.GetView()
|
|
originY := view.OriginY()
|
|
// As far as the view is concerned, we are always selecting a range
|
|
view.SetRangeSelectStart(startIdx)
|
|
view.SetCursorY(endIdx - originY)
|
|
}
|
|
|
|
func (self *MergeConflictsContext) GetOriginY() int {
|
|
view := self.GetView()
|
|
conflictMiddle := self.GetState().GetConflictMiddle()
|
|
return int(math.Max(0, float64(conflictMiddle-(view.Height()/2))))
|
|
}
|