Add support for editor env variable with flags

editor/editor.go

@@ -64,12 +64,21 @@ func writeTmpFile(content io.Reader) (string, error) {
 
 // editorCmd returns a os/exec.Cmd to open the provided file
 func editorCmd(filename string) *exec.Cmd {
-	editorPath := os.Getenv("EDITOR")
-	if editorPath == "" {
-		editorPath = defaultEditor
+	editorEnv := os.Getenv("EDITOR")
+	if editorEnv == "" {
+		editorEnv = defaultEditor
 	}
 
-	editor := execCommand(editorPath, filename)
+	editorVars := strings.Split(editorEnv, " ")
+
+	path := editorVars[0]
+	args := []string{filename}
+
+	if len(editorVars) > 1 {
+		args = append(editorVars[1:], args...)
+	}
+
+	editor := execCommand(path, args...)
 
 	editor.Stdin = os.Stdin
 	editor.Stdout = os.Stdout

editor/editor_test.go

@@ -11,8 +11,15 @@ import (
 )
 
 func TestEditorCmd(t *testing.T) {
-	editor := editorCmd(".")
+	os.Setenv("EDITOR", "")
+	editor := editorCmd("foobar")
 	testhelper.Assert(t, editor != nil, "editor should not be nil")
+	testhelper.Equals(t, editor.Args, []string{"vim", "foobar"})
+
+	os.Setenv("EDITOR", "subl -w")
+	editor = editorCmd("foobar")
+	testhelper.Assert(t, editor != nil, "editor should not be nil")
+	testhelper.Equals(t, editor.Args, []string{"subl", "-w", "foobar"})
 }
 
 func TestWriteTmpFile(t *testing.T) {