Read all lines from task when starting to search

Author: stefanhaller

pkg/gui/controllers.go

@@ -190,8 +190,8 @@ func (gui *Gui) resetHelpersAndControllers() {
 	patchExplorerControllerFactory := controllers.NewPatchExplorerControllerFactory(common)
 	stagingController := controllers.NewStagingController(common, gui.State.Contexts.Staging, gui.State.Contexts.StagingSecondary, false)
 	stagingSecondaryController := controllers.NewStagingController(common, gui.State.Contexts.StagingSecondary, gui.State.Contexts.Staging, true)
-	mainViewController := controllers.NewMainViewController(common, gui.State.Contexts.Normal, gui.State.Contexts.NormalSecondary)
-	secondaryViewController := controllers.NewMainViewController(common, gui.State.Contexts.NormalSecondary, gui.State.Contexts.Normal)
+	mainViewController := controllers.NewMainViewController(common, gui.State.Contexts.Normal, gui.State.Contexts.NormalSecondary, &gui.viewBufferManagerMap)
+	secondaryViewController := controllers.NewMainViewController(common, gui.State.Contexts.NormalSecondary, gui.State.Contexts.Normal, &gui.viewBufferManagerMap)
 	patchBuildingController := controllers.NewPatchBuildingController(common)
 	snakeController := controllers.NewSnakeController(common)
 	reflogCommitsController := controllers.NewReflogCommitsController(common)

pkg/gui/controllers/main_view_controller.go

@@ -1,29 +1,34 @@
 package controllers
 
 import (
+	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
+	"github.com/jesseduffield/lazygit/pkg/tasks"
 )
 
 type MainViewController struct {
 	baseController
-	c *ControllerCommon
+	c                    *ControllerCommon
+	viewBufferManagerMap *map[string]*tasks.ViewBufferManager
 
-	context      types.Context
-	otherContext types.Context
+	context      *context.MainContext
+	otherContext *context.MainContext
 }
 
 var _ types.IController = &MainViewController{}
 
 func NewMainViewController(
 	c *ControllerCommon,
-	context types.Context,
-	otherContext types.Context,
+	context *context.MainContext,
+	otherContext *context.MainContext,
+	viewBufferManagerMap *map[string]*tasks.ViewBufferManager,
 ) *MainViewController {
 	return &MainViewController{
-		baseController: baseController{},
-		c:              c,
-		context:        context,
-		otherContext:   otherContext,
+		baseController:       baseController{},
+		c:                    c,
+		viewBufferManagerMap: viewBufferManagerMap,
+		context:              context,
+		otherContext:         otherContext,
 	}
 }
 
@@ -41,6 +46,13 @@ func (self *MainViewController) GetKeybindings(opts types.KeybindingsOpts) []*ty
 			Handler:     self.escape,
 			Description: self.c.Tr.ExitFocusedMainView,
 		},
+		{
+			// overriding this because we want to read all of the task's output before we start searching
+			Key:         opts.GetKey(opts.Config.Universal.StartSearch),
+			Handler:     self.openSearch,
+			Description: self.c.Tr.StartSearch,
+			Tag:         "navigation",
+		},
 	}
 }
 
@@ -61,3 +73,15 @@ func (self *MainViewController) escape() error {
 	self.c.Context().Pop()
 	return nil
 }
+
+func (self *MainViewController) openSearch() error {
+	if manager, ok := (*self.viewBufferManagerMap)[self.context.GetViewName()]; ok {
+		manager.ReadToEnd(func() {
+			self.c.OnUIThread(func() error {
+				return self.c.Helpers().Search.OpenSearchPrompt(self.context)
+			})
+		})
+	}
+
+	return nil
+}