diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2023-08-09 21:34:51 +1000 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2023-08-09 22:03:58 +1000 |
commit | 9c5eedf748aaf26ed2042aa20babc42fa13eca41 (patch) | |
tree | b7c518716fd1c906f72ccddd0295861d08d51eb8 /pkg/commands | |
parent | ca08956f776f34a9324c51add98398e19806d009 (diff) |
use 'suspend' instead of 'editInTerminal' internally
'suspend' is a more appropriate name, especially now that you can choose not to suspend despite
still being in a terminal
Diffstat (limited to 'pkg/commands')
-rw-r--r-- | pkg/commands/git_commands/file.go | 12 | ||||
-rw-r--r-- | pkg/commands/git_commands/file_test.go | 60 |
2 files changed, 36 insertions, 36 deletions
diff --git a/pkg/commands/git_commands/file.go b/pkg/commands/git_commands/file.go index 9fd5e8929..173e342f7 100644 --- a/pkg/commands/git_commands/file.go +++ b/pkg/commands/git_commands/file.go @@ -83,14 +83,14 @@ func (self *FileCommands) GetEditCmdStr(filename string) (string, bool) { } } - template, editInTerminal := config.GetEditTemplate(&self.UserConfig.OS, self.guessDefaultEditor) + template, suspend := config.GetEditTemplate(&self.UserConfig.OS, self.guessDefaultEditor) templateValues := map[string]string{ "filename": self.cmd.Quote(filename), } cmdStr := utils.ResolvePlaceholderString(template, templateValues) - return cmdStr, editInTerminal + return cmdStr, suspend } func (self *FileCommands) GetEditAtLineCmdStr(filename string, lineNumber int) (string, bool) { @@ -101,7 +101,7 @@ func (self *FileCommands) GetEditAtLineCmdStr(filename string, lineNumber int) ( } } - template, editInTerminal := config.GetEditAtLineTemplate(&self.UserConfig.OS, self.guessDefaultEditor) + template, suspend := config.GetEditAtLineTemplate(&self.UserConfig.OS, self.guessDefaultEditor) templateValues := map[string]string{ "filename": self.cmd.Quote(filename), @@ -109,7 +109,7 @@ func (self *FileCommands) GetEditAtLineCmdStr(filename string, lineNumber int) ( } cmdStr := utils.ResolvePlaceholderString(template, templateValues) - return cmdStr, editInTerminal + return cmdStr, suspend } func (self *FileCommands) GetEditAtLineAndWaitCmdStr(filename string, lineNumber int) string { @@ -132,14 +132,14 @@ func (self *FileCommands) GetEditAtLineAndWaitCmdStr(filename string, lineNumber } func (self *FileCommands) GetOpenDirInEditorCmdStr(path string) (string, bool) { - template, editInTerminal := config.GetOpenDirInEditorTemplate(&self.UserConfig.OS, self.guessDefaultEditor) + template, suspend := config.GetOpenDirInEditorTemplate(&self.UserConfig.OS, self.guessDefaultEditor) templateValues := map[string]string{ "dir": self.cmd.Quote(path), } cmdStr := utils.ResolvePlaceholderString(template, templateValues) - return cmdStr, editInTerminal + return cmdStr, suspend } func (self *FileCommands) guessDefaultEditor() string { diff --git a/pkg/commands/git_commands/file_test.go b/pkg/commands/git_commands/file_test.go index 1141a3577..c87e56683 100644 --- a/pkg/commands/git_commands/file_test.go +++ b/pkg/commands/git_commands/file_test.go @@ -179,34 +179,34 @@ func TestEditFileCmdStrLegacy(t *testing.T) { func TestEditFileCmd(t *testing.T) { type scenario struct { - filename string - osConfig config.OSConfig - expectedCmdStr string - expectedEditInTerminal bool + filename string + osConfig config.OSConfig + expectedCmdStr string + suspend bool } scenarios := []scenario{ { - filename: "test", - osConfig: config.OSConfig{}, - expectedCmdStr: `vim -- "test"`, - expectedEditInTerminal: true, + filename: "test", + osConfig: config.OSConfig{}, + expectedCmdStr: `vim -- "test"`, + suspend: true, }, { filename: "test", osConfig: config.OSConfig{ Edit: "nano {{filename}}", }, - expectedCmdStr: `nano "test"`, - expectedEditInTerminal: true, + expectedCmdStr: `nano "test"`, + suspend: true, }, { filename: "file/with space", osConfig: config.OSConfig{ EditPreset: "sublime", }, - expectedCmdStr: `subl -- "file/with space"`, - expectedEditInTerminal: false, + expectedCmdStr: `subl -- "file/with space"`, + suspend: false, }, } @@ -218,28 +218,28 @@ func TestEditFileCmd(t *testing.T) { userConfig: userConfig, }) - cmdStr, editInTerminal := instance.GetEditCmdStr(s.filename) + cmdStr, suspend := instance.GetEditCmdStr(s.filename) assert.Equal(t, s.expectedCmdStr, cmdStr) - assert.Equal(t, s.expectedEditInTerminal, editInTerminal) + assert.Equal(t, s.suspend, suspend) } } func TestEditFileAtLineCmd(t *testing.T) { type scenario struct { - filename string - lineNumber int - osConfig config.OSConfig - expectedCmdStr string - expectedEditInTerminal bool + filename string + lineNumber int + osConfig config.OSConfig + expectedCmdStr string + suspend bool } scenarios := []scenario{ { - filename: "test", - lineNumber: 42, - osConfig: config.OSConfig{}, - expectedCmdStr: `vim +42 -- "test"`, - expectedEditInTerminal: true, + filename: "test", + lineNumber: 42, + osConfig: config.OSConfig{}, + expectedCmdStr: `vim +42 -- "test"`, + suspend: true, }, { filename: "test", @@ -247,8 +247,8 @@ func TestEditFileAtLineCmd(t *testing.T) { osConfig: config.OSConfig{ EditAtLine: "nano +{{line}} {{filename}}", }, - expectedCmdStr: `nano +35 "test"`, - expectedEditInTerminal: true, + expectedCmdStr: `nano +35 "test"`, + suspend: true, }, { filename: "file/with space", @@ -256,8 +256,8 @@ func TestEditFileAtLineCmd(t *testing.T) { osConfig: config.OSConfig{ EditPreset: "sublime", }, - expectedCmdStr: `subl -- "file/with space":12`, - expectedEditInTerminal: false, + expectedCmdStr: `subl -- "file/with space":12`, + suspend: false, }, } @@ -269,9 +269,9 @@ func TestEditFileAtLineCmd(t *testing.T) { userConfig: userConfig, }) - cmdStr, editInTerminal := instance.GetEditAtLineCmdStr(s.filename, s.lineNumber) + cmdStr, suspend := instance.GetEditAtLineCmdStr(s.filename, s.lineNumber) assert.Equal(t, s.expectedCmdStr, cmdStr) - assert.Equal(t, s.expectedEditInTerminal, editInTerminal) + assert.Equal(t, s.suspend, suspend) } } |