Fix cursor position change after CopyLine command (#2353)

[micro.git] / internal / action / terminal_supported.go

diff --git a/internal/action/terminal_supported.go b/internal/action/terminal_supported.go
index 21a6de0ed124e1832584d0cee8e910ccfd2cb32f..4255536c09863f4c672a7dcecb338fc68871e74a 100644 (file)
--- a/internal/action/terminal_supported.go
+++ b/internal/action/terminal_supported.go
@@ -3,26 +3,42 @@
 package action
 
 import (
-       "github.com/zyedidia/micro/internal/shell"
-       "github.com/zyedidia/micro/pkg/shellwords"
+       shellquote "github.com/kballard/go-shellquote"
+       "github.com/zyedidia/micro/v2/internal/shell"
 )
 
+// TermEmuSupported is a constant that marks if the terminal emulator is supported
 const TermEmuSupported = true
 
-func RunTermEmulator(h *BufPane, input string, wait bool, getOutput bool, callback string, userargs []interface{}) error {
-       args, err := shellwords.Split(input)
+// RunTermEmulator starts a terminal emulator from a bufpane with the given input (command)
+// if wait is true it will wait for the user to exit by pressing enter once the executable has terminated
+// if getOutput is true it will redirect the stdout of the process to a pipe which will be passed to the
+// callback which is a function that takes a string and a list of optional user arguments
+func RunTermEmulator(h *BufPane, input string, wait bool, getOutput bool, callback func(out string, userargs []interface{}), userargs []interface{}) error {
+       args, err := shellquote.Split(input)
        if err != nil {
                return err
        }
+       if len(args) == 0 {
+               return nil
+       }
 
        t := new(shell.Terminal)
-       t.Start(args, getOutput, wait, callback, userargs)
+       err = t.Start(args, getOutput, wait, callback, userargs)
+       if err != nil {
+               return err
+       }
 
        h.AddTab()
        id := MainTab().Panes[0].ID()
 
        v := h.GetView()
-       MainTab().Panes[0] = NewTermPane(v.X, v.Y, v.Width, v.Height, t, id)
+
+       tp, err := NewTermPane(v.X, v.Y, v.Width, v.Height, t, id, MainTab())
+       if err != nil {
+               return err
+       }
+       MainTab().Panes[0] = tp
        MainTab().SetActive(0)
 
        return nil