go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-03 00:57:52 +02:00
Code Issues Releases Activity

Cleanup: add NewRunPtyTaskWithPrefix funxtion instead of setting Prefix manually

Browse Source 
This is consistent with NewRunCommandTaskWithPrefix.
This commit is contained in:
Stefan Haller
2025-07-01 09:40:44 +02:00
parent edcfce22f0
commit ef16867ff1
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/gui/controllers/files_controller.go
View File

@ -262,15 +262,14 @@ func (self *FilesController) GetOnRenderToMain() func() {
}
if node.File.ShortStatus == "DU" || node.File.ShortStatus == "UD" {
cmdObj := self.c.Git().Diff.DiffCmdObj([]string{"--base", "--", node.GetPath()})
task := types.NewRunPtyTask(cmdObj.GetCmd())
task.Prefix = message + "\n\n"
prefix := message + "\n\n"
if node.File.ShortStatus == "DU" {
task.Prefix += self.c.Tr.MergeConflictIncomingDiff
prefix += self.c.Tr.MergeConflictIncomingDiff
} else {
task.Prefix += self.c.Tr.MergeConflictCurrentDiff
prefix += self.c.Tr.MergeConflictCurrentDiff
}
task.Prefix += "\n\n"
opts.Main.Task = task
prefix += "\n\n"
opts.Main.Task = types.NewRunPtyTaskWithPrefix(cmdObj.GetCmd(), prefix)
} else {
opts.Main.Task = types.NewRenderStringTask(message)
}