diff --git a/integration/main.go b/integration/main.go index ba61a2723..a9f78db31 100644 --- a/integration/main.go +++ b/integration/main.go @@ -223,10 +223,12 @@ func Test() error { err := createFixture(testPath, actualDir) if err != nil { - // return err + return err } - runLazygit(testPath, rootDir, record, speed) + if err := runLazygit(testPath, rootDir, record, speed); err != nil { + return err + } if updateSnapshots { err = oscommands.CopyDir(actualDir, expectedDir) @@ -431,5 +433,8 @@ func prepareIntegrationTestDir(actualDir string) { } func main() { - Test() + err := Test() + if err != nil { + panic(err) + } } diff --git a/pkg/gui/context.go b/pkg/gui/context.go index 8b3a0c27d..615fcecca 100644 --- a/pkg/gui/context.go +++ b/pkg/gui/context.go @@ -557,14 +557,14 @@ func (gui *Gui) activateContext(c Context) error { return nil } -// currently unused -func (gui *Gui) renderContextStack() string { - result := "" - for _, context := range gui.State.ContextManager.ContextStack { - result += string(context.GetKey()) + "\n" - } - return result -} +// // currently unused +// func (gui *Gui) renderContextStack() string { +// result := "" +// for _, context := range gui.State.ContextManager.ContextStack { +// result += string(context.GetKey()) + "\n" +// } +// return result +// } func (gui *Gui) currentContext() Context { gui.State.ContextManager.Lock() diff --git a/pkg/gui/line_by_line_panel.go b/pkg/gui/line_by_line_panel.go index a676db498..df787b165 100644 --- a/pkg/gui/line_by_line_panel.go +++ b/pkg/gui/line_by_line_panel.go @@ -205,30 +205,6 @@ func (gui *Gui) handleMouseDrag() error { }) } -func (gui *Gui) handleMouseScrollUp() error { - return gui.withLBLActiveCheck(func(state *lBlPanelState) error { - if gui.popupPanelFocused() { - return nil - } - - state.SelectMode = LINE - - return gui.LBLCycleLine(-1, state) - }) -} - -func (gui *Gui) handleMouseScrollDown() error { - return gui.withLBLActiveCheck(func(state *lBlPanelState) error { - if gui.popupPanelFocused() { - return nil - } - - state.SelectMode = LINE - - return gui.LBLCycleLine(1, state) - }) -} - func (gui *Gui) getSelectedCommitFileName() string { idx := gui.State.Panels.CommitFiles.SelectedLineIdx