sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-08-09 09:22:48 +03:00
Code Activity

fix: improve default editCommandTemplate

Browse Source
This commit is contained in:
Ryooooooga
2022-04-22 21:54:03 +09:00
parent 8b103b16bd
commit e5730cb80b
6 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/commands/git_commands/file.go
View File

@@ -5,7 +5,6 @@ import (
"strconv"
"github.com/go-errors/errors"
"github.com/jesseduffield/lazygit/pkg/config"
"github.com/jesseduffield/lazygit/pkg/utils"
)
@@ -59,14 +58,16 @@ func (self *FileCommands) GetEditCmdStr(filename string, lineNumber int) (string
}
editCmdTemplate := self.UserConfig.OS.EditCommandTemplate
if editCmdTemplate == config.DefaultEditCommandTemplate {
if len(editCmdTemplate) == 0 {
switch editor {
case "emacs", "nano", "vi", "vim":
editCmdTemplate = "{{editor}} +{{line}} {{filename}}"
case "emacs", "nano", "vi", "vim", "nvim":
editCmdTemplate = "{{editor}} +{{line}} -- {{filename}}"
case "subl":
editCmdTemplate = "{{editor}} {{filename}}:{{line}}"
editCmdTemplate = "{{editor}} -- {{filename}}:{{line}}"
case "code":
editCmdTemplate = "{{editor}} -r --goto {{filename}}:{{line}}"
editCmdTemplate = "{{editor}} -r --goto -- {{filename}}:{{line}}"
default:
editCmdTemplate = "{{editor}} -- {{filename}}"
}
}
return utils.ResolvePlaceholderString(editCmdTemplate, templateValues), nil

26
pkg/commands/git_commands/file_test.go
View File

@@ -47,7 +47,7 @@ func TestEditFileCmdStr(t *testing.T) {
gitConfigMockResponses: nil,
test: func(cmdStr string, err error) {
assert.NoError(t, err)
assert.Equal(t, `nano +1 "test"`, cmdStr)
assert.Equal(t, `nano "test"`, cmdStr)
},
},
{
@@ -61,7 +61,7 @@ func TestEditFileCmdStr(t *testing.T) {
gitConfigMockResponses: map[string]string{"core.editor": "nano"},
test: func(cmdStr string, err error) {
assert.NoError(t, err)
assert.Equal(t, `nano +1 "test"`, cmdStr)
assert.Equal(t, `nano "test"`, cmdStr)
},
},
{
@@ -79,7 +79,7 @@ func TestEditFileCmdStr(t *testing.T) {
gitConfigMockResponses: nil,
test: func(cmdStr string, err error) {
assert.NoError(t, err)
assert.Equal(t, `nano +1 "test"`, cmdStr)
assert.Equal(t, `nano "test"`, cmdStr)
},
},
{
@@ -97,7 +97,7 @@ func TestEditFileCmdStr(t *testing.T) {
gitConfigMockResponses: nil,
test: func(cmdStr string, err error) {
assert.NoError(t, err)
assert.Equal(t, `emacs +1 "test"`, cmdStr)
assert.Equal(t, `emacs "test"`, cmdStr)
},
},
{
@@ -112,7 +112,7 @@ func TestEditFileCmdStr(t *testing.T) {
gitConfigMockResponses: nil,
test: func(cmdStr string, err error) {
assert.NoError(t, err)
assert.Equal(t, `vi +1 "test"`, cmdStr)
assert.Equal(t, `vi "test"`, cmdStr)
},
},
{
@@ -127,7 +127,7 @@ func TestEditFileCmdStr(t *testing.T) {
gitConfigMockResponses: nil,
test: func(cmdStr string, err error) {
assert.NoError(t, err)
assert.Equal(t, `vi +1 "file/with space"`, cmdStr)
assert.Equal(t, `vi "file/with space"`, cmdStr)
},
},
{
@@ -144,6 +144,20 @@ func TestEditFileCmdStr(t *testing.T) {
assert.Equal(t, `vim +1 "open file/at line"`, cmdStr)
},
},
{
filename: "default edit command template",
configEditCommand: "vim",
configEditCommandTemplate: "",
runner: oscommands.NewFakeRunner(t),
getenv: func(env string) string {
return ""
},
gitConfigMockResponses: nil,
test: func(cmdStr string, err error) {
assert.NoError(t, err)
assert.Equal(t, `vim +1 -- "default edit command template"`, cmdStr)
},
},
}
for _, s := range scenarios {

6
pkg/config/config_default_platform.go
View File

@@ -3,14 +3,12 @@
package config
const DefaultEditCommandTemplate = `{{editor}} {{filename}}`
// GetPlatformDefaultConfig gets the defaults for the platform
func GetPlatformDefaultConfig() OSConfig {
return OSConfig{
EditCommand: ``,
EditCommandTemplate: DefaultEditCommandTemplate,
OpenCommand: "open {{filename}}",
EditCommandTemplate: "",
OpenCommand: "open -- {{filename}}",
OpenLinkCommand: "open {{link}}",
}
}

4
pkg/config/config_linux.go
View File

@@ -1,12 +1,10 @@
package config
const DefaultEditCommandTemplate = `{{editor}} {{filename}}`
// GetPlatformDefaultConfig gets the defaults for the platform
func GetPlatformDefaultConfig() OSConfig {
return OSConfig{
EditCommand: ``,
EditCommandTemplate: DefaultEditCommandTemplate,
EditCommandTemplate: "",
OpenCommand: `xdg-open {{filename}} >/dev/null`,
OpenLinkCommand: `xdg-open {{link}} >/dev/null`,
}

4
pkg/config/config_windows.go
View File

@@ -1,12 +1,10 @@
package config
const DefaultEditCommandTemplate = `{{editor}} {{filename}}`
// GetPlatformDefaultConfig gets the defaults for the platform
func GetPlatformDefaultConfig() OSConfig {
return OSConfig{
EditCommand: ``,
EditCommandTemplate: DefaultEditCommandTemplate,
EditCommandTemplate: "",
OpenCommand: `start "" {{filename}}`,
OpenLinkCommand: `start "" {{link}}`,
}