Skip to content

Commit 000224b

Browse files
KashifKhnKashifKhn
committed
fix: handle terminal raw mode output formatting
In raw mode, standalone \n only moves cursor down without returning to column 0. This adds a crlfWriter to convert \n to \r\n when in interactive mode, ensuring proper output alignment for child processes.
1 parent 8324fe9 commit 000224b

File tree

4 files changed

+86
-32
lines changed

4 files changed

+86
-32
lines changed

‎internal/cli/dev/keyboard.go‎

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package dev
33
import (
44
"fmt"
55
"os"
6-
"runtime"
76

87
"github.com/mattn/go-isatty"
98
"golang.org/x/term"
@@ -145,29 +144,25 @@ func (kl *KeyboardListener) parseKey(buf []byte) KeyCommand {
145144
}
146145

147146
func ClearScreen() {
148-
if runtime.GOOS == "windows" {
149-
fmt.Print("\033[H\033[2J")
150-
} else {
151-
fmt.Print("\033[H\033[2J")
152-
}
147+
fmt.Print("\033[H\033[2J")
153148
}
154149

155150
func PrintKeyCommands() {
156-
fmt.Println()
157-
fmt.Println("\033[36mHaft dev commands:\033[0m")
158-
fmt.Println(" \033[33mr\033[0m Restart (compile first, then restart)")
159-
fmt.Println(" \033[33mq\033[0m Quit")
160-
fmt.Println(" \033[33mc\033[0m Clear screen")
161-
fmt.Println(" \033[33mh\033[0m Help")
162-
fmt.Println()
151+
fmt.Print("\r\n")
152+
fmt.Print("\033[36mHaft dev commands:\033[0m\r\n")
153+
fmt.Print(" \033[33mr\033[0m Restart (compile first, then restart)\r\n")
154+
fmt.Print(" \033[33mq\033[0m Quit\r\n")
155+
fmt.Print(" \033[33mc\033[0m Clear screen\r\n")
156+
fmt.Print(" \033[33mh\033[0m Help\r\n")
157+
fmt.Print("\r\n")
163158
}
164159

165160
func PrintBanner() {
166-
fmt.Println()
167-
fmt.Println("\033[36m╭─────────────────────────────────────────╮\033[0m")
168-
fmt.Println("\033[36m│\033[0m \033[1;35mHaft Dev Server\033[0m \033[36m│\033[0m")
169-
fmt.Println("\033[36m│\033[0m Press \033[33mr\033[0m to restart, \033[33mq\033[0m to quit \033[36m│\033[0m")
170-
fmt.Println("\033[36m│\033[0m Press \033[33mh\033[0m for more commands \033[36m│\033[0m")
171-
fmt.Println("\033[36m╰─────────────────────────────────────────╯\033[0m")
172-
fmt.Println()
161+
fmt.Print("\r\n")
162+
fmt.Print("\033[36m╭─────────────────────────────────────────╮\033[0m\r\n")
163+
fmt.Print("\033[36m│\033[0m \033[1;35mHaft Dev Server\033[0m \033[36m│\033[0m\r\n")
164+
fmt.Print("\033[36m│\033[0m Press \033[33mr\033[0m to restart, \033[33mq\033[0m to quit \033[36m│\033[0m\r\n")
165+
fmt.Print("\033[36m│\033[0m Press \033[33mh\033[0m for more commands \033[36m│\033[0m\r\n")
166+
fmt.Print("\033[36m╰─────────────────────────────────────────╯\033[0m\r\n")
167+
fmt.Print("\r\n")
173168
}

‎internal/cli/dev/process.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ func (pm *ProcessManager) buildRunCommand() (string, []string) {
340340

341341
func (pm *ProcessManager) buildMavenRunCommand() (string, []string) {
342342
executable := getMavenExecutable()
343-
args := []string{"spring-boot:run", "-DskipTests", "-B"}
343+
args := []string{"spring-boot:run", "-DskipTests", "-B", "-ntp"}
344344

345345
if pm.profile != "" {
346346
args = append(args, fmt.Sprintf("-Dspring-boot.run.profiles=%s", pm.profile))

‎internal/cli/dev/serve.go‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package dev
33
import (
44
"context"
55
"fmt"
6+
"io"
67
"os"
78
"os/signal"
89
"runtime"
@@ -74,18 +75,24 @@ func runServe(profile string, debug bool, port int, noInteractive bool) error {
7475
return fmt.Errorf("not a Spring Boot project: %w", err)
7576
}
7677

78+
keyboard := NewKeyboardListener()
79+
isInteractive := keyboard.IsInteractive() && !noInteractive
80+
81+
var stdout, stderr io.Writer = os.Stdout, os.Stderr
82+
if isInteractive {
83+
stdout = newCRLFWriter(os.Stdout)
84+
stderr = newCRLFWriter(os.Stderr)
85+
}
86+
7787
pm := NewProcessManager(ProcessConfig{
7888
BuildTool: result.BuildTool,
7989
Profile: profile,
8090
Debug: debug,
8191
Port: port,
82-
Stdout: os.Stdout,
83-
Stderr: os.Stderr,
92+
Stdout: stdout,
93+
Stderr: stderr,
8494
})
8595

86-
keyboard := NewKeyboardListener()
87-
isInteractive := keyboard.IsInteractive() && !noInteractive
88-
8996
trigger := NewTriggerWatcher()
9097
if err := trigger.Setup(); err != nil {
9198
logger.Warning("Failed to setup trigger watcher", "error", err)
@@ -133,15 +140,15 @@ func runServe(profile string, debug bool, port int, noInteractive bool) error {
133140
switch cmd {
134141
case KeyRestart:
135142
if pm.IsBusy() {
136-
fmt.Println("\n\033[33m→ Restart already in progress...\033[0m")
143+
fmt.Print("\r\n\033[33m→ Restart already in progress...\033[0m\r\n")
137144
continue
138145
}
139146
if err := pm.Restart(ctx); err != nil {
140147
logger.Debug("Restart failed", "error", err)
141148
}
142149

143150
case KeyQuit:
144-
fmt.Println("\n\033[33m→ Shutting down...\033[0m")
151+
fmt.Print("\r\n\033[33m→ Shutting down...\033[0m\r\n")
145152
if err := pm.Stop(); err != nil {
146153
logger.Debug("Error during shutdown", "error", err)
147154
}
@@ -159,7 +166,7 @@ func runServe(profile string, debug bool, port int, noInteractive bool) error {
159166
if pm.IsBusy() {
160167
continue
161168
}
162-
fmt.Println("\n\033[35m→ External restart triggered\033[0m")
169+
fmt.Print("\r\n\033[35m→ External restart triggered\033[0m\r\n")
163170
if err := pm.Restart(ctx); err != nil {
164171
logger.Debug("External restart failed", "error", err)
165172
}
@@ -168,8 +175,8 @@ func runServe(profile string, debug bool, port int, noInteractive bool) error {
168175
if pm.State() == StateIdle || pm.State() == StateFailed {
169176
if lastErr := pm.LastError(); lastErr != nil {
170177
if isInteractive {
171-
fmt.Printf("\n\033[31mProcess stopped: %v\033[0m\n", lastErr)
172-
fmt.Println("\033[33mPress 'r' to restart or 'q' to quit\033[0m")
178+
fmt.Printf("\r\n\033[31mProcess stopped: %v\033[0m\r\n", lastErr)
179+
fmt.Print("\033[33mPress 'r' to restart or 'q' to quit\033[0m\r\n")
173180
waitForRestartOrQuit(keyboard, sigChan, pm, ctx)
174181
} else {
175182
return lastErr
@@ -204,7 +211,7 @@ func waitForRestartOrQuit(keyboard *KeyboardListener, sigChan chan os.Signal, pm
204211
}
205212
return
206213
case KeyQuit:
207-
fmt.Println("\n\033[33m→ Shutting down...\033[0m")
214+
fmt.Print("\r\n\033[33m→ Shutting down...\033[0m\r\n")
208215
if err := pm.Stop(); err != nil {
209216
logger.Debug("Error during shutdown", "error", err)
210217
}

‎internal/cli/dev/writer.go‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
package dev
2+
3+
import (
4+
"bytes"
5+
"io"
6+
)
7+
8+
type crlfWriter struct {
9+
w io.Writer
10+
}
11+
12+
func newCRLFWriter(w io.Writer) *crlfWriter {
13+
return &crlfWriter{w: w}
14+
}
15+
16+
func (c *crlfWriter) Write(p []byte) (n int, err error) {
17+
written := 0
18+
for len(p) > 0 {
19+
idx := bytes.IndexByte(p, '\n')
20+
if idx == -1 {
21+
n, err := c.w.Write(p)
22+
written += n
23+
return written, err
24+
}
25+
26+
if idx > 0 && p[idx-1] == '\r' {
27+
n, err := c.w.Write(p[:idx+1])
28+
written += n
29+
if err != nil {
30+
return written, err
31+
}
32+
p = p[idx+1:]
33+
continue
34+
}
35+
36+
if idx > 0 {
37+
n, err := c.w.Write(p[:idx])
38+
written += n
39+
if err != nil {
40+
return written, err
41+
}
42+
}
43+
44+
_, err := c.w.Write([]byte("\r\n"))
45+
if err != nil {
46+
return written, err
47+
}
48+
written += 1
49+
p = p[idx+1:]
50+
}
51+
return written, nil
52+
}

0 commit comments

Comments
 (0)