1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-03-05 15:15:49 +02:00

add openFile to gui struct

This commit is contained in:
Anthony HAMON 2018-08-23 21:05:09 +02:00
parent ed2dcd9e46
commit 23fe0290ad
2 changed files with 9 additions and 4 deletions

View File

@ -248,7 +248,7 @@ func (gui *Gui) handleFileOpen(g *gocui.Gui, v *gocui.View) error {
if err != nil {
return err
}
return gui.genericFileOpen(g, v, file.Name, func(filename string) (*exec.Cmd, error) { return nil, gui.OSCommand.OpenFile(filename) })
return gui.openFile(file.Name)
}
func (gui *Gui) handleSublimeFileOpen(g *gocui.Gui, v *gocui.View) error {
@ -417,3 +417,10 @@ func (gui *Gui) handleResetHard(g *gocui.Gui, v *gocui.View) error {
return gui.refreshFiles(g)
}, nil)
}
func (gui *Gui) openFile(filename string) error {
if err := gui.OSCommand.OpenFile(filename); err != nil {
return gui.createErrorPanel(gui.g, err.Error())
}
return nil
}

View File

@ -2,7 +2,6 @@ package gui
import (
"fmt"
"os/exec"
"github.com/fatih/color"
"github.com/jesseduffield/gocui"
@ -66,8 +65,7 @@ func (gui *Gui) handleStatusSelect(g *gocui.Gui, v *gocui.View) error {
}
func (gui *Gui) handleOpenConfig(g *gocui.Gui, v *gocui.View) error {
filename := gui.Config.GetUserConfig().ConfigFileUsed()
return gui.genericFileOpen(g, v, filename, func(filename string) (*exec.Cmd, error) { return nil, gui.OSCommand.OpenFile(filename) })
return gui.openFile(gui.Config.GetUserConfig().ConfigFileUsed())
}
func (gui *Gui) handleEditConfig(g *gocui.Gui, v *gocui.View) error {