Support editing files in existing neovim instance (#2916)

1 files changed, 9 insertions, 10 deletions

diff --git a/pkg/gui/controllers/helpers/files_helper.go b/pkg/gui/controllers/helpers/files_helper.go
index 8f9a816f8..140a71127 100644
--- a/pkg/gui/controllers/helpers/files_helper.go
+++ b/pkg/gui/controllers/helpers/files_helper.go
@@ -19,33 +19,32 @@ func NewFilesHelper(c *HelperCommon) *FilesHelper {
 var _ IFilesHelper = &FilesHelper{}
 
 func (self *FilesHelper) EditFile(filename string) error {
-	cmdStr, editInTerminal := self.c.Git().File.GetEditCmdStr(filename)
-	return self.callEditor(cmdStr, editInTerminal)
+	cmdStr, suspend := self.c.Git().File.GetEditCmdStr(filename)
+	return self.callEditor(cmdStr, suspend)
 }
 
 func (self *FilesHelper) EditFileAtLine(filename string, lineNumber int) error {
-	cmdStr, editInTerminal := self.c.Git().File.GetEditAtLineCmdStr(filename, lineNumber)
-	return self.callEditor(cmdStr, editInTerminal)
+	cmdStr, suspend := self.c.Git().File.GetEditAtLineCmdStr(filename, lineNumber)
+	return self.callEditor(cmdStr, suspend)
 }
 
 func (self *FilesHelper) EditFileAtLineAndWait(filename string, lineNumber int) error {
 	cmdStr := self.c.Git().File.GetEditAtLineAndWaitCmdStr(filename, lineNumber)
 
-	// Always suspend, regardless of the value of the editInTerminal config,
+	// Always suspend, regardless of the value of the suspend config,
 	// since we want to prevent interacting with the UI until the editor
 	// returns, even if the editor doesn't use the terminal
 	return self.callEditor(cmdStr, true)
 }
 
 func (self *FilesHelper) OpenDirInEditor(path string) error {
-	cmdStr := self.c.Git().File.GetOpenDirInEditorCmdStr(path)
+	cmdStr, suspend := self.c.Git().File.GetOpenDirInEditorCmdStr(path)
 
-	// Not editing in terminal because surely that's not a thing.
-	return self.callEditor(cmdStr, false)
+	return self.callEditor(cmdStr, suspend)
 }
 
-func (self *FilesHelper) callEditor(cmdStr string, editInTerminal bool) error {
-	if editInTerminal {
+func (self *FilesHelper) callEditor(cmdStr string, suspend bool) error {
+	if suspend {
 		return self.c.RunSubprocessAndRefresh(
 			self.c.OS().Cmd.NewShell(cmdStr),
 		)