fix: more terminal width fixes

alecthomas · alecthomas · commit 0fee65fbe98d · 2024-03-08T16:16:24.000+11:00
diff --git a/Justfile b/Justfile
@@ -0,0 +1,3 @@
+# Start hot reloading
+dev:
+  watchexec -- go build -o build/bit -v ./cmd/bit
diff --git a/bin/.just-1.23.0.pkg b/bin/.just-1.23.0.pkg
@@ -0,0 +1 @@
+hermit
diff --git a/bin/just b/bin/just
@@ -0,0 +1 @@
+.just-1.23.0.pkg
diff --git a/engine/engine.go b/engine/engine.go
@@ -671,11 +671,11 @@ func (e *Engine) evaluate() error {
 		}
 		var changed string
 		if target.storedHash != target.realHash {
-			changed = " (changed)"
+			changed = "(changed)"
 		} else {
-			changed = " (no change)"
+			changed = "(no change)"
 		}
-		logger.Tracef("Hash: %016x -> %016x%s", target.storedHash, target.realHash, changed)
+		logger.Tracef("%s - %s - %016x -> %016x", changed, target.outputs, target.storedHash, target.realHash)
 	}
 	return nil
 }
diff --git a/engine/logging/logger.go b/engine/logging/logger.go
@@ -102,16 +102,21 @@ func NewLogger(config LogConfig) *Logger {
 
 // Scope returns a new logger with the given scope.
 func (l *Logger) Scope(scope string) *Logger {
+	return &Logger{scope: scope, level: l.level, size: l.size}
+}
+
+func (l *Logger) getScope() string {
 	// Margin is 20% of terminal.
 	size := l.size.Load()
 	margin := int(size.margin)
+	scope := l.scope
 	if len(scope) > margin {
 		scope = "…" + scope[len(scope)-margin+1:]
 	} else {
 		scope += strings.Repeat(" ", margin-len(scope))
 	}
 	scope = strings.ReplaceAll(scope, "%", "%%")
-	return &Logger{scope: scope, level: l.level, size: l.size}
+	return scope
 }
 
 var ansiTable = func() map[LogLevel]string {
@@ -140,8 +145,9 @@ func (l *Logger) getPrefix(level LogLevel) string {
 		return ""
 	}
 	prefix := ansiTable[level]
-	if l.scope != "" {
-		prefix = targetColour(l.scope) + l.scope + "\033[0m" + "| " + prefix
+	scope := l.getScope()
+	if scope != "" {
+		prefix = targetColour(scope) + scope + "\033[0m" + "| " + prefix
 	}
 	return prefix
 }
@@ -203,9 +209,8 @@ func (l *Logger) Exec(dir, command string) error {
 	defer l.size.Unsubscribe(changes)
 
 	// Resize the PTY to exclude the margin.
-	if w, h, err := term.GetSize(int(os.Stdin.Fd())); err == nil {
-		_ = pty.Setsize(p, &pty.Winsize{Rows: uint16(h), Cols: uint16(w) - (l.size.Load().margin + 1)})
-	}
+	size := l.size.Load()
+	_ = pty.Setsize(p, &pty.Winsize{Rows: size.height, Cols: size.width - (l.size.Load().margin + 1)})
 
 	go func() {
 		for size := range changes {
@@ -286,7 +291,7 @@ func (l *Logger) writerScanner(wg *sync.WaitGroup, r *io.PipeReader, level LogLe
 				switch cs.Final {
 				case 'G': // G is cursor horizontal absolute.
 					// We have a CHA sequence, so add the margin width.
-					col := params[0] + 18
+					col := params[0] + int(l.size.Load().margin) + 2
 					segment = csi.Text(fmt.Sprintf("\033[%dG", col))
 
 				case 'K': // K is erase in line. We want to intercept 1 (clear to start of line) and 2 (clear entire line).
@@ -345,8 +350,8 @@ func (l *Logger) syncTermSize() {
 	// Watch WINCH for changes.
 	winch := make(chan os.Signal, 1)
 	signal.Notify(winch, syscall.SIGWINCH)
-	defer signal.Stop(winch)
 	go func() {
+		defer signal.Stop(winch)
 		for range winch {
 			if w, h, err := term.GetSize(int(os.Stdin.Fd())); err == nil {
 				margin := uint16(max(16, w/5))

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# Start hot reloading`
	`2`	`+dev:`
	`3`	`+ watchexec -- go build -o build/bit -v ./cmd/bit`
Original file line number	Diff line number	Diff line change
`@@ -671,11 +671,11 @@ func (e *Engine) evaluate() error {`
`671`	`671`	`}`
`672`	`672`	`var changed string`
`673`	`673`	`if target.storedHash != target.realHash {`
`674`		`- changed = " (changed)"`
	`674`	`+ changed = "(changed)"`
`675`	`675`	`} else {`
`676`		`- changed = " (no change)"`
	`676`	`+ changed = "(no change)"`
`677`	`677`	`}`
`678`		`- logger.Tracef("Hash: %016x -> %016x%s", target.storedHash, target.realHash, changed)`
	`678`	`+ logger.Tracef("%s - %s - %016x -> %016x", changed, target.outputs, target.storedHash, target.realHash)`
`679`	`679`	`}`
`680`	`680`	`return nil`
`681`	`681`	`}`