From 0aca99fe0168a3e7773d8e98751154c164e6949f Mon Sep 17 00:00:00 2001
From: Joe Mooring <joe.mooring@veriphor.com>
Date: Thu, 6 Jan 2022 21:19:13 -0800
Subject: [PATCH] create: Correctly pass newContentEditor flags

Fixes #9356
---
 create/content.go | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/create/content.go b/create/content.go
index 6ae91288264..400cff341fa 100644
--- a/create/content.go
+++ b/create/content.go
@@ -343,15 +343,24 @@ func (b *contentBuilder) openInEditorIfConfigured(filename string) error {
 		return nil
 	}
 
-	b.h.Log.Printf("Editing %q with %q ...\n", filename, editor)
-	cmd, err := b.h.Deps.ExecHelper.New(
-		editor,
+	editorExec := strings.Fields(editor)[0]
+	editorFlags := strings.Fields(editor)[1:]
+
+	var args []interface{}
+	for _, editorFlag := range editorFlags {
+		args = append(args, editorFlag)
+	}
+	args = append(
+		args,
 		filename,
 		hexec.WithStdin(os.Stdin),
 		hexec.WithStderr(os.Stderr),
 		hexec.WithStdout(os.Stdout),
 	)
 
+	b.h.Log.Printf("Editing %q with %q ...\n", filename, editorExec)
+
+	cmd, err := b.h.Deps.ExecHelper.New(editorExec, args...)
 	if err != nil {
 		return err
 	}