one line

ammario · ammario · commit 0612a27d791b · 2023-03-24T21:16:35.000Z
diff --git a/cli/root.go b/cli/root.go
@@ -13,7 +13,6 @@ import (
 	"os"
 	"os/signal"
 	"path/filepath"
-	"regexp"
 	"runtime"
 	"strings"
 	"syscall"
@@ -825,6 +824,8 @@ type prettyErrorFormatter struct {
 
 func (p *prettyErrorFormatter) format(err error) {
 	if err == nil {
+		// 🍒
+		p.printf("\n")
 		return
 	}
 
@@ -852,8 +853,8 @@ func (p *prettyErrorFormatter) format(err error) {
 		} else {
 			msg = errorWithoutChildren
 		}
-		p.wrappedPrintf(
-			"%s\n",
+		p.printf(
+			"%s",
 			textStyle.Render(msg),
 		)
 
@@ -864,23 +865,16 @@ func (p *prettyErrorFormatter) format(err error) {
 
 	textStyle := lipgloss.NewStyle().Foreground(lipgloss.Color("#969696")).Bold(false)
 
-	p.wrappedPrintf(
+	p.printf(
 		"%s",
-		textStyle.Render(errorWithoutChildren),
+		textStyle.Render(": "+errorWithoutChildren),
 	)
 	p.level++
 	p.format(underErr)
 }
 
-func (p *prettyErrorFormatter) wrappedPrintf(format string, a ...interface{}) {
-	s := lipgloss.NewStyle().Width(ttyWidth()).Render(
-		fmt.Sprintf(format, a...),
-	)
-
-	// Not sure why, but lipgloss is adding extra spaces we need to remove.
-	excessSpaceRe := regexp.MustCompile(`[[:blank:]]*\n[[:blank:]]*$`)
-	s = excessSpaceRe.ReplaceAllString(s, "\n")
-
+func (p *prettyErrorFormatter) printf(format string, a ...interface{}) {
+	s := fmt.Sprintf(format, a...)
 	_, _ = p.w.Write(
 		[]byte(
 			s,
diff --git a/cli/root_test.go b/cli/root_test.go
@@ -42,10 +42,6 @@ func TestCommandHelp(t *testing.T) {
 		cmd  []string
 	}
 	tests := []testCase{
-		{
-			name: "coder --help",
-			cmd:  []string{"--help"},
-		},
 		{
 			name: "coder --help",
 			cmd:  []string{"--help"},

Original file line number	Diff line number	Diff line change
`@@ -42,10 +42,6 @@ func TestCommandHelp(t *testing.T) {`
`42`	`42`	`cmd []string`
`43`	`43`	`}`
`44`	`44`	`tests := []testCase{`
`45`		`- {`
`46`		`- name: "coder --help",`
`47`		`- cmd: []string{"--help"},`
`48`		`- },`
`49`	`45`	`{`
`50`	`46`	`name: "coder --help",`
`51`	`47`	`cmd: []string{"--help"},`