mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-04-04 22:34:39 +02:00
eaf3bf0971
This way it won't scroll to the top; we want this when entering the staging panel or the patch building panel by clicking into the view, and also when returning from these views by pressing escape. Note that there's a bug in this latter case: the focused panel still scrolls to the top when hitting escape, we will fix this in the next commit. Change it in the same way for NewRenderStringWithScrollTask, just for consistency, although it's not really necessary there. We use this function only for focusing the merge conflict view, and in that case we already have an empty task key before and after, so it doesn't change anything there.
137 lines
3.1 KiB
Go
137 lines
3.1 KiB
Go
package gui
|
|
|
|
import (
|
|
"io"
|
|
"os/exec"
|
|
"strings"
|
|
|
|
"github.com/jesseduffield/gocui"
|
|
"github.com/jesseduffield/lazygit/pkg/tasks"
|
|
)
|
|
|
|
func (gui *Gui) newCmdTask(view *gocui.View, cmd *exec.Cmd, prefix string) error {
|
|
cmdStr := strings.Join(cmd.Args, " ")
|
|
gui.c.Log.WithField(
|
|
"command",
|
|
cmdStr,
|
|
).Debug("RunCommand")
|
|
|
|
manager := gui.getManager(view)
|
|
|
|
start := func() (*exec.Cmd, io.Reader) {
|
|
r, err := cmd.StdoutPipe()
|
|
if err != nil {
|
|
gui.c.Log.Error(err)
|
|
}
|
|
cmd.Stderr = cmd.Stdout
|
|
|
|
if err := cmd.Start(); err != nil {
|
|
gui.c.Log.Error(err)
|
|
}
|
|
|
|
return cmd, r
|
|
}
|
|
|
|
linesToRead := gui.linesToReadFromCmdTask(view)
|
|
if err := manager.NewTask(manager.NewCmdTask(start, prefix, linesToRead, nil), cmdStr); err != nil {
|
|
gui.c.Log.Error(err)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (gui *Gui) newStringTask(view *gocui.View, str string) error {
|
|
// using str so that if rendering the exact same thing we don't reset the origin
|
|
return gui.newStringTaskWithKey(view, str, str)
|
|
}
|
|
|
|
func (gui *Gui) newStringTaskWithoutScroll(view *gocui.View, str string) error {
|
|
manager := gui.getManager(view)
|
|
|
|
f := func(tasks.TaskOpts) error {
|
|
gui.c.SetViewContent(view, str)
|
|
return nil
|
|
}
|
|
|
|
if err := manager.NewTask(f, manager.GetTaskKey()); err != nil {
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (gui *Gui) newStringTaskWithScroll(view *gocui.View, str string, originX int, originY int) error {
|
|
manager := gui.getManager(view)
|
|
|
|
f := func(tasks.TaskOpts) error {
|
|
gui.c.SetViewContent(view, str)
|
|
view.SetOrigin(originX, originY)
|
|
return nil
|
|
}
|
|
|
|
if err := manager.NewTask(f, manager.GetTaskKey()); err != nil {
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (gui *Gui) newStringTaskWithKey(view *gocui.View, str string, key string) error {
|
|
manager := gui.getManager(view)
|
|
|
|
f := func(tasks.TaskOpts) error {
|
|
gui.c.ResetViewOrigin(view)
|
|
gui.c.SetViewContent(view, str)
|
|
return nil
|
|
}
|
|
|
|
if err := manager.NewTask(f, key); err != nil {
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (gui *Gui) getManager(view *gocui.View) *tasks.ViewBufferManager {
|
|
manager, ok := gui.viewBufferManagerMap[view.Name()]
|
|
if !ok {
|
|
manager = tasks.NewViewBufferManager(
|
|
gui.Log,
|
|
view,
|
|
func() {
|
|
// we could clear here, but that actually has the effect of causing a flicker
|
|
// where the view may contain no content momentarily as the gui refreshes.
|
|
// Instead, we're rewinding the write pointer so that we will just start
|
|
// overwriting the existing content from the top down. Once we've reached
|
|
// the end of the content do display, we call view.FlushStaleCells() to
|
|
// clear out the remaining content from the previous render.
|
|
view.Reset()
|
|
},
|
|
func() {
|
|
gui.render()
|
|
},
|
|
func() {
|
|
// Need to check if the content of the view is well past the origin.
|
|
linesHeight := view.ViewLinesHeight()
|
|
_, originY := view.Origin()
|
|
if linesHeight < originY {
|
|
newOriginY := linesHeight
|
|
|
|
view.SetOrigin(0, newOriginY)
|
|
}
|
|
|
|
view.FlushStaleCells()
|
|
},
|
|
func() {
|
|
view.SetOrigin(0, 0)
|
|
},
|
|
func() gocui.Task {
|
|
return gui.c.GocuiGui().NewTask()
|
|
},
|
|
)
|
|
gui.viewBufferManagerMap[view.Name()] = manager
|
|
}
|
|
|
|
return manager
|
|
}
|