summaryrefslogtreecommitdiffstats
path: root/pkg
diff options
context:
space:
mode:
Diffstat (limited to 'pkg')
-rw-r--r--pkg/commands/oscommands/os.go5
-rw-r--r--pkg/gui/controllers/helpers/files_helper.go7
-rw-r--r--pkg/gui/controllers/merge_conflicts_controller.go3
-rw-r--r--pkg/gui/controllers/patch_building_controller.go3
-rw-r--r--pkg/gui/controllers/staging_controller.go3
5 files changed, 4 insertions, 17 deletions
diff --git a/pkg/commands/oscommands/os.go b/pkg/commands/oscommands/os.go
index 39149ce84..11c964ca4 100644
--- a/pkg/commands/oscommands/os.go
+++ b/pkg/commands/oscommands/os.go
@@ -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()
diff --git a/pkg/gui/controllers/helpers/files_helper.go b/pkg/gui/controllers/helpers/files_helper.go
index 29aa19ce1..a0d2d4e8c 100644
--- a/pkg/gui/controllers/helpers/files_helper.go
+++ b/pkg/gui/controllers/helpers/files_helper.go
@@ -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
diff --git a/pkg/gui/controllers/merge_conflicts_controller.go b/pkg/gui/controllers/merge_conflicts_controller.go
index 7cfcfa62d..de282d4c9 100644
--- a/pkg/gui/controllers/merge_conflicts_controller.go
+++ b/pkg/gui/controllers/merge_conflicts_controller.go
@@ -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 {
diff --git a/pkg/gui/controllers/patch_building_controller.go b/pkg/gui/controllers/patch_building_controller.go
index 613aadd1d..329ae0ea1 100644
--- a/pkg/gui/controllers/patch_building_controller.go
+++ b/pkg/gui/controllers/patch_building_controller.go
@@ -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 {
diff --git a/pkg/gui/controllers/staging_controller.go b/pkg/gui/controllers/staging_controller.go
index 07e39ea1f..bcd6d5114 100644
--- a/pkg/gui/controllers/staging_controller.go
+++ b/pkg/gui/controllers/staging_controller.go
@@ -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 {