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

Merge branch 'master' into custom-keybindings

Browse Source
This commit is contained in:
David Chen 2019-12-08 14:40:11 -08:00 committed by GitHub
commit 5f21f190b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/gui/files_panel.go
View File

@ -27,15 +27,7 @@ func (gui *Gui) getSelectedFile(g *gocui.Gui) (*commands.File, error) {
return gui.State.Files[selectedLine], nil return gui.State.Files[selectedLine], nil
} }
func (gui *Gui) handleFileSelect(g *gocui.Gui, v *gocui.View) error {
return gui.selectFile(false)
}
func (gui *Gui) selectFile(alreadySelected bool) error { func (gui *Gui) selectFile(alreadySelected bool) error {
if _, err := gui.g.SetCurrentView("files"); err != nil {
return err
}
file, err := gui.getSelectedFile(gui.g) file, err := gui.getSelectedFile(gui.g)
if err != nil { if err != nil {
if err != gui.Errors.ErrNoFiles { if err != gui.Errors.ErrNoFiles {
@ -221,6 +213,14 @@ func (gui *Gui) allFilesStaged() bool {
return true return true
} }
func (gui *Gui) focusAndSelectFile(g *gocui.Gui, v *gocui.View) error {
if _, err := gui.g.SetCurrentView("files"); err != nil {
return err
}
return gui.selectFile(false)
}
func (gui *Gui) handleStageAll(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) handleStageAll(g *gocui.Gui, v *gocui.View) error {
var err error var err error
if gui.allFilesStaged() { if gui.allFilesStaged() {
@ -236,7 +236,7 @@ func (gui *Gui) handleStageAll(g *gocui.Gui, v *gocui.View) error {
return err return err
} }
return gui.handleFileSelect(gui.g, v) return gui.selectFile(false)
} }
func (gui *Gui) handleIgnoreFile(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) handleIgnoreFile(g *gocui.Gui, v *gocui.View) error {

4
pkg/gui/list_view.go
View File

@ -79,8 +79,8 @@ func (gui *Gui) getListViews() []*listView {
viewName: "files", viewName: "files",
getItemsLength: func() int { return len(gui.State.Files) }, getItemsLength: func() int { return len(gui.State.Files) },
getSelectedLineIdxPtr: func() *int { return &gui.State.Panels.Files.SelectedLine }, getSelectedLineIdxPtr: func() *int { return &gui.State.Panels.Files.SelectedLine },
handleFocus: gui.wrappedHandler(func() error { return gui.selectFile(true) }), handleFocus: gui.focusAndSelectFile,
handleItemSelect: gui.wrappedHandler(func() error { return gui.selectFile(true) }), handleItemSelect: gui.focusAndSelectFile,
handleClickSelectedItem: gui.handleFilePress, handleClickSelectedItem: gui.handleFilePress,
gui: gui, gui: gui,
rendersToMainView: true, rendersToMainView: true,

2
pkg/gui/view_helpers.go
View File

@ -102,7 +102,7 @@ func (gui *Gui) newLineFocused(g *gocui.Gui, v *gocui.View) error {
case "status": case "status":
return gui.handleStatusSelect(g, v) return gui.handleStatusSelect(g, v)
case "files": case "files":
return gui.handleFileSelect(g, v) return gui.focusAndSelectFile(g, v)
case "branches": case "branches":
branchesView := gui.getBranchesView() branchesView := gui.getBranchesView()
switch branchesView.Context { switch branchesView.Context {