mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-03-19 21:28:28 +02:00
Remove line number support for "open" command
The "open" command is supposed to behave in the same way as double-clicking a file in the Finder/Explorer. The concept of jumping to a specific line in the file doesn't make sense for this; use "edit" instead.
This commit is contained in:
parent
2947b56134
commit
08d679c3a8
@ -78,14 +78,9 @@ func FileType(path string) string {
|
||||
}
|
||||
|
||||
func (c *OSCommand) OpenFile(filename string) error {
|
||||
return c.OpenFileAtLine(filename, 1)
|
||||
}
|
||||
|
||||
func (c *OSCommand) OpenFileAtLine(filename string, lineNumber int) error {
|
||||
commandTemplate := c.UserConfig.OS.OpenCommand
|
||||
templateValues := map[string]string{
|
||||
"filename": c.Quote(filename),
|
||||
"line": fmt.Sprintf("%d", lineNumber),
|
||||
}
|
||||
command := utils.ResolvePlaceholderString(commandTemplate, templateValues)
|
||||
return c.Cmd.NewShell(command).Run()
|
||||
|
@ -10,7 +10,6 @@ type IFilesHelper interface {
|
||||
EditFile(filename string) error
|
||||
EditFileAtLine(filename string, lineNumber int) error
|
||||
OpenFile(filename string) error
|
||||
OpenFileAtLine(filename string, lineNumber int) error
|
||||
}
|
||||
|
||||
type FilesHelper struct {
|
||||
@ -63,12 +62,8 @@ func (self *FilesHelper) callEditor(cmdStr string, editInTerminal bool) error {
|
||||
}
|
||||
|
||||
func (self *FilesHelper) OpenFile(filename string) error {
|
||||
return self.OpenFileAtLine(filename, 1)
|
||||
}
|
||||
|
||||
func (self *FilesHelper) OpenFileAtLine(filename string, lineNumber int) error {
|
||||
self.c.LogAction(self.c.Tr.Actions.OpenFile)
|
||||
if err := self.os.OpenFileAtLine(filename, lineNumber); err != nil {
|
||||
if err := self.os.OpenFile(filename); err != nil {
|
||||
return self.c.Error(err)
|
||||
}
|
||||
return nil
|
||||
|
@ -166,8 +166,7 @@ func (self *MergeConflictsController) HandleEditFile() error {
|
||||
}
|
||||
|
||||
func (self *MergeConflictsController) HandleOpenFile() error {
|
||||
lineNumber := self.context().GetState().GetSelectedLine()
|
||||
return self.helpers.Files.OpenFileAtLine(self.context().GetState().GetPath(), lineNumber)
|
||||
return self.helpers.Files.OpenFile(self.context().GetState().GetPath())
|
||||
}
|
||||
|
||||
func (self *MergeConflictsController) HandleScrollLeft() error {
|
||||
|
@ -69,8 +69,7 @@ func (self *PatchBuildingController) OpenFile() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
lineNumber := self.context().GetState().CurrentLineNumber()
|
||||
return self.helpers.Files.OpenFileAtLine(path, lineNumber)
|
||||
return self.helpers.Files.OpenFile(path)
|
||||
}
|
||||
|
||||
func (self *PatchBuildingController) EditFile() error {
|
||||
|
@ -109,8 +109,7 @@ func (self *StagingController) OpenFile() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
lineNumber := self.context.GetState().CurrentLineNumber()
|
||||
return self.helpers.Files.OpenFileAtLine(path, lineNumber)
|
||||
return self.helpers.Files.OpenFile(path)
|
||||
}
|
||||
|
||||
func (self *StagingController) EditFile() error {
|
||||
|
Loading…
x
Reference in New Issue
Block a user