go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-06 23:46:13 +02:00
Code Issues Releases Activity

Pass absolute file paths to all editor commands

Browse Source 
This helps work around bugs in editors that may get confused about relative
paths (like nvim-remote, see https://github.com/neovim/neovim/issues/18519), and
shouldn't have any negative effect on others.
This commit is contained in:
Stefan Haller 2024-01-25 08:56:10 +01:00
parent 05b97c8c8e
commit 12500be554
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkg/gui/controllers/helpers/files_helper.go
View File

@ -1,5 +1,9 @@
package helpers package helpers
import (
"path/filepath"
)
type IFilesHelper interface { type IFilesHelper interface {
EditFile(filename string) error EditFile(filename string) error
EditFileAtLine(filename string, lineNumber int) error EditFileAtLine(filename string, lineNumber int) error
@ -19,17 +23,29 @@ func NewFilesHelper(c *HelperCommon) *FilesHelper {
var _ IFilesHelper = &FilesHelper{} var _ IFilesHelper = &FilesHelper{}
func (self *FilesHelper) EditFile(filename string) error { func (self *FilesHelper) EditFile(filename string) error {
cmdStr, suspend := self.c.Git().File.GetEditCmdStr(filename) absPath, err := filepath.Abs(filename)
if err != nil {
return err
}
cmdStr, suspend := self.c.Git().File.GetEditCmdStr(absPath)
return self.callEditor(cmdStr, suspend) return self.callEditor(cmdStr, suspend)
} }
func (self *FilesHelper) EditFileAtLine(filename string, lineNumber int) error { func (self *FilesHelper) EditFileAtLine(filename string, lineNumber int) error {
cmdStr, suspend := self.c.Git().File.GetEditAtLineCmdStr(filename, lineNumber) absPath, err := filepath.Abs(filename)
if err != nil {
return err
}
cmdStr, suspend := self.c.Git().File.GetEditAtLineCmdStr(absPath, lineNumber)
return self.callEditor(cmdStr, suspend) return self.callEditor(cmdStr, suspend)
} }
func (self *FilesHelper) EditFileAtLineAndWait(filename string, lineNumber int) error { func (self *FilesHelper) EditFileAtLineAndWait(filename string, lineNumber int) error {
cmdStr := self.c.Git().File.GetEditAtLineAndWaitCmdStr(filename, lineNumber) absPath, err := filepath.Abs(filename)
if err != nil {
return err
}
cmdStr := self.c.Git().File.GetEditAtLineAndWaitCmdStr(absPath, lineNumber)
// Always suspend, regardless of the value of the suspend config, // Always suspend, regardless of the value of the suspend config,
// since we want to prevent interacting with the UI until the editor // since we want to prevent interacting with the UI until the editor
@ -38,7 +54,11 @@ func (self *FilesHelper) EditFileAtLineAndWait(filename string, lineNumber int)
} }
func (self *FilesHelper) OpenDirInEditor(path string) error { func (self *FilesHelper) OpenDirInEditor(path string) error {
cmdStr, suspend := self.c.Git().File.GetOpenDirInEditorCmdStr(path) absPath, err := filepath.Abs(path)
if err != nil {
return err
}
cmdStr, suspend := self.c.Git().File.GetOpenDirInEditorCmdStr(absPath)
return self.callEditor(cmdStr, suspend) return self.callEditor(cmdStr, suspend)
} }
@ -54,8 +74,12 @@ func (self *FilesHelper) callEditor(cmdStr string, suspend bool) error {
} }
func (self *FilesHelper) OpenFile(filename string) error { func (self *FilesHelper) OpenFile(filename string) error {
absPath, err := filepath.Abs(filename)
if err != nil {
return err
}
self.c.LogAction(self.c.Tr.Actions.OpenFile) self.c.LogAction(self.c.Tr.Actions.OpenFile)
if err := self.c.OS().OpenFile(filename); err != nil { if err := self.c.OS().OpenFile(absPath); err != nil {
return self.c.Error(err) return self.c.Error(err)
} }
return nil return nil