diff --git a/pkg/commands/git_commands/file.go b/pkg/commands/git_commands/file.go index 353a8dcdc..8744197f0 100644 --- a/pkg/commands/git_commands/file.go +++ b/pkg/commands/git_commands/file.go @@ -5,6 +5,7 @@ import ( "strconv" "github.com/go-errors/errors" + "github.com/jesseduffield/lazygit/pkg/config" "github.com/jesseduffield/lazygit/pkg/utils" ) @@ -58,7 +59,7 @@ func (self *FileCommands) GetEditCmdStr(filename string, lineNumber int) (string } editCmdTemplate := self.UserConfig.OS.EditCommandTemplate - if editCmdTemplate == "{{editor}} {{filename}}" { + if editCmdTemplate == config.DefaultEditCommandTemplate { switch editor { case "emacs", "nano", "vi", "vim": editCmdTemplate = "{{editor}} +{{line}} {{filename}}" diff --git a/pkg/config/config_default_platform.go b/pkg/config/config_default_platform.go index 32b1df473..32b76cbf0 100644 --- a/pkg/config/config_default_platform.go +++ b/pkg/config/config_default_platform.go @@ -3,11 +3,13 @@ package config +const DefaultEditCommandTemplate = `{{editor}} {{filename}}` + // GetPlatformDefaultConfig gets the defaults for the platform func GetPlatformDefaultConfig() OSConfig { return OSConfig{ EditCommand: ``, - EditCommandTemplate: `{{editor}} {{filename}}`, + EditCommandTemplate: DefaultEditCommandTemplate, OpenCommand: "open {{filename}}", OpenLinkCommand: "open {{link}}", } diff --git a/pkg/config/config_linux.go b/pkg/config/config_linux.go index dd5708a53..93baa1335 100644 --- a/pkg/config/config_linux.go +++ b/pkg/config/config_linux.go @@ -1,10 +1,12 @@ package config +const DefaultEditCommandTemplate = `{{editor}} {{filename}}` + // GetPlatformDefaultConfig gets the defaults for the platform func GetPlatformDefaultConfig() OSConfig { return OSConfig{ EditCommand: ``, - EditCommandTemplate: `{{editor}} {{filename}}`, + EditCommandTemplate: DefaultEditCommandTemplate, OpenCommand: `xdg-open {{filename}} >/dev/null`, OpenLinkCommand: `xdg-open {{link}} >/dev/null`, } diff --git a/pkg/config/config_windows.go b/pkg/config/config_windows.go index 301eecec1..eb0b00728 100644 --- a/pkg/config/config_windows.go +++ b/pkg/config/config_windows.go @@ -1,10 +1,12 @@ package config +const DefaultEditCommandTemplate = `{{editor}} {{filename}}` + // GetPlatformDefaultConfig gets the defaults for the platform func GetPlatformDefaultConfig() OSConfig { return OSConfig{ EditCommand: ``, - EditCommandTemplate: `{{editor}} {{filename}}`, + EditCommandTemplate: DefaultEditCommandTemplate, OpenCommand: `start "" {{filename}}`, OpenLinkCommand: `start "" {{link}}`, }