From 75a8c0c73e1ff0789c29e67629d93345d9d6b047 Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Fri, 23 May 2025 15:02:48 +0200 Subject: [PATCH] Pass cmdObj instead of task to processOutput This is a preparation for the next commit, where we will need more from the cmdObj in processOutput. --- pkg/commands/oscommands/cmd_obj_runner.go | 6 +++--- pkg/commands/oscommands/cmd_obj_runner_test.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/commands/oscommands/cmd_obj_runner.go b/pkg/commands/oscommands/cmd_obj_runner.go index 6acd8d0fb..c8500d93d 100644 --- a/pkg/commands/oscommands/cmd_obj_runner.go +++ b/pkg/commands/oscommands/cmd_obj_runner.go @@ -10,7 +10,6 @@ import ( "time" "github.com/go-errors/errors" - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/utils" "github.com/sasha-s/go-deadlock" "github.com/sirupsen/logrus" @@ -340,7 +339,7 @@ func (self *cmdObjRunner) runAndDetectCredentialRequest( tr := io.TeeReader(handler.stdoutPipe, cmdWriter) go utils.Safe(func() { - self.processOutput(tr, handler.stdinPipe, promptUserForCredential, cmdObj.GetTask()) + self.processOutput(tr, handler.stdinPipe, promptUserForCredential, cmdObj) }) }) } @@ -349,9 +348,10 @@ func (self *cmdObjRunner) processOutput( reader io.Reader, writer io.Writer, promptUserForCredential func(CredentialType) <-chan string, - task gocui.Task, + cmdObj *CmdObj, ) { checkForCredentialRequest := self.getCheckForCredentialRequestFunc() + task := cmdObj.GetTask() scanner := bufio.NewScanner(reader) scanner.Split(bufio.ScanBytes) diff --git a/pkg/commands/oscommands/cmd_obj_runner_test.go b/pkg/commands/oscommands/cmd_obj_runner_test.go index c906cea3f..280ba213b 100644 --- a/pkg/commands/oscommands/cmd_obj_runner_test.go +++ b/pkg/commands/oscommands/cmd_obj_runner_test.go @@ -120,8 +120,8 @@ func TestProcessOutput(t *testing.T) { reader := strings.NewReader(scenario.output) writer := &strings.Builder{} - task := gocui.NewFakeTask() - runner.processOutput(reader, writer, toChanFn(scenario.promptUserForCredential), task) + cmdObj := &CmdObj{task: gocui.NewFakeTask()} + runner.processOutput(reader, writer, toChanFn(scenario.promptUserForCredential), cmdObj) if writer.String() != scenario.expectedToWrite { t.Errorf("expected to write '%s' but got '%s'", scenario.expectedToWrite, writer.String())