mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-07-28 16:02:01 +03:00
more explicit
This commit is contained in:
@ -5,6 +5,7 @@ import (
|
|||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
"github.com/go-errors/errors"
|
"github.com/go-errors/errors"
|
||||||
|
"github.com/jesseduffield/lazygit/pkg/config"
|
||||||
"github.com/jesseduffield/lazygit/pkg/utils"
|
"github.com/jesseduffield/lazygit/pkg/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -58,7 +59,7 @@ func (self *FileCommands) GetEditCmdStr(filename string, lineNumber int) (string
|
|||||||
}
|
}
|
||||||
|
|
||||||
editCmdTemplate := self.UserConfig.OS.EditCommandTemplate
|
editCmdTemplate := self.UserConfig.OS.EditCommandTemplate
|
||||||
if editCmdTemplate == "{{editor}} {{filename}}" {
|
if editCmdTemplate == config.DefaultEditCommandTemplate {
|
||||||
switch editor {
|
switch editor {
|
||||||
case "emacs", "nano", "vi", "vim":
|
case "emacs", "nano", "vi", "vim":
|
||||||
editCmdTemplate = "{{editor}} +{{line}} {{filename}}"
|
editCmdTemplate = "{{editor}} +{{line}} {{filename}}"
|
||||||
|
@ -3,11 +3,13 @@
|
|||||||
|
|
||||||
package config
|
package config
|
||||||
|
|
||||||
|
const DefaultEditCommandTemplate = `{{editor}} {{filename}}`
|
||||||
|
|
||||||
// GetPlatformDefaultConfig gets the defaults for the platform
|
// GetPlatformDefaultConfig gets the defaults for the platform
|
||||||
func GetPlatformDefaultConfig() OSConfig {
|
func GetPlatformDefaultConfig() OSConfig {
|
||||||
return OSConfig{
|
return OSConfig{
|
||||||
EditCommand: ``,
|
EditCommand: ``,
|
||||||
EditCommandTemplate: `{{editor}} {{filename}}`,
|
EditCommandTemplate: DefaultEditCommandTemplate,
|
||||||
OpenCommand: "open {{filename}}",
|
OpenCommand: "open {{filename}}",
|
||||||
OpenLinkCommand: "open {{link}}",
|
OpenLinkCommand: "open {{link}}",
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,12 @@
|
|||||||
package config
|
package config
|
||||||
|
|
||||||
|
const DefaultEditCommandTemplate = `{{editor}} {{filename}}`
|
||||||
|
|
||||||
// GetPlatformDefaultConfig gets the defaults for the platform
|
// GetPlatformDefaultConfig gets the defaults for the platform
|
||||||
func GetPlatformDefaultConfig() OSConfig {
|
func GetPlatformDefaultConfig() OSConfig {
|
||||||
return OSConfig{
|
return OSConfig{
|
||||||
EditCommand: ``,
|
EditCommand: ``,
|
||||||
EditCommandTemplate: `{{editor}} {{filename}}`,
|
EditCommandTemplate: DefaultEditCommandTemplate,
|
||||||
OpenCommand: `xdg-open {{filename}} >/dev/null`,
|
OpenCommand: `xdg-open {{filename}} >/dev/null`,
|
||||||
OpenLinkCommand: `xdg-open {{link}} >/dev/null`,
|
OpenLinkCommand: `xdg-open {{link}} >/dev/null`,
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,12 @@
|
|||||||
package config
|
package config
|
||||||
|
|
||||||
|
const DefaultEditCommandTemplate = `{{editor}} {{filename}}`
|
||||||
|
|
||||||
// GetPlatformDefaultConfig gets the defaults for the platform
|
// GetPlatformDefaultConfig gets the defaults for the platform
|
||||||
func GetPlatformDefaultConfig() OSConfig {
|
func GetPlatformDefaultConfig() OSConfig {
|
||||||
return OSConfig{
|
return OSConfig{
|
||||||
EditCommand: ``,
|
EditCommand: ``,
|
||||||
EditCommandTemplate: `{{editor}} {{filename}}`,
|
EditCommandTemplate: DefaultEditCommandTemplate,
|
||||||
OpenCommand: `start "" {{filename}}`,
|
OpenCommand: `start "" {{filename}}`,
|
||||||
OpenLinkCommand: `start "" {{link}}`,
|
OpenLinkCommand: `start "" {{link}}`,
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user