fixing review comments

Author: sathiraumesh

cmd/cli/readline/editor.go

@@ -30,7 +30,9 @@ func runEditor(content string, defaultEditor string) (string, error) {
 		return content, err
 	}
 
-	return string(edited), nil
+	result := strings.TrimRight(string(edited), "\r\n")
+
+	return result, nil
 }
 
 func buildEditorCmd(defaultEditor string, filePath string) *exec.Cmd {
@@ -41,9 +43,7 @@ func buildEditorCmd(defaultEditor string, filePath string) *exec.Cmd {
 
 	var cmd *exec.Cmd
 	if runtime.GOOS == "windows" {
-		parts := strings.Fields(editor)
-		args := append(parts[1:], filePath)
-		cmd = exec.Command(parts[0], args...)
+		cmd = exec.Command("cmd", "/C", editor+" \""+filePath+"\"")
 	} else {
 		cmd = exec.Command("sh", "-c", editor+" \"$1\"", "--", filePath)
 	}

cmd/cli/readline/editor_test.go

@@ -37,6 +37,18 @@ func TestRunEditor(t *testing.T) {
 			input:            "",
 			expected:         "new content",
 		},
+		{
+			name:             "strips trailing newline",
+			mockEditorScript: `printf "edited\n" > "$1"`,
+			input:            "",
+			expected:         "edited",
+		},
+		{
+			name:             "strips trailing carriage return and newline",
+			mockEditorScript: `printf "edited\r\n" > "$1"`,
+			input:            "",
+			expected:         "edited",
+		},
 	}
 
 	for _, tt := range tests {

cmd/cli/readline/readline.go

@@ -212,9 +212,11 @@ func (i *Instance) Readline() (string, error) {
 		case CharCtrlX:
 			fd := os.Stdin.Fd()
 			edited, err := openInEditor(fd, i.Terminal.termios, buf.String())
-			if err == nil {
-				buf.Replace([]rune(edited))
+			if err != nil {
+				fmt.Fprintf(os.Stderr, "error opening editor: %s\n", err)
+				break
 			}
+			buf.Replace([]rune(edited))
 		case CharCtrlZ:
 			fd := os.Stdin.Fd()
 			return handleCharCtrlZ(fd, i.Terminal.termios)