👔 up: x/termenv - fix GetTermSize error, add support from ENV get width and height

Author: inhere

x/termenv/detect_nonwin.go

@@ -41,6 +41,6 @@ func detectSpecialTermColor(termVal string) (ColorLevel, bool) {
 	return TermColor16, false
 }
 
-func syscallStdinFd() int {
-	return syscall.Stdin
-}
+func syscallStdinFd() int { return syscall.Stdin }
+
+func syscallStdoutFd() int { return syscall.Stdout }

x/termenv/detect_windows.go

@@ -169,3 +169,8 @@ func EnableVTProcessing(stream syscall.Handle, enable bool) error {
 func syscallStdinFd() int {
 	return int(syscall.Stdin)
 }
+
+// on Windows, must convert to int
+func syscallStdoutFd() int {
+	return int(syscall.Stdout)
+}

x/termenv/termenv.go

@@ -5,6 +5,7 @@ package termenv
 import (
 	"fmt"
 	"os"
+	"strconv"
 
 	"golang.org/x/term"
 )
@@ -60,20 +61,37 @@ func setLastErr(err error) {
 // )
 var terminalWidth, terminalHeight int
 
-// GetTermSize for current console terminal.
+// GetTermSize for current console terminal. will first try to get from environment variables COLUMNS and LINES.
 func GetTermSize(refresh ...bool) (w int, h int) {
-	if terminalWidth > 0 && len(refresh) > 0 && !refresh[0] {
+	if terminalWidth > 0 && (len(refresh) == 0 || !refresh[0]) {
+		return terminalWidth, terminalHeight
+	}
+
+	// 首先尝试从环境变量获取
+	if cols := os.Getenv("COLUMNS"); cols != "" {
+		if width, err := strconv.Atoi(cols); err == nil && width > 0 {
+			terminalWidth = width
+		}
+	}
+	if rows := os.Getenv("LINES"); rows != "" {
+		if height, err := strconv.Atoi(rows); err == nil && height > 0 {
+			terminalHeight = height
+		}
+	}
+	if terminalWidth > 0 && terminalHeight > 0 {
 		return terminalWidth, terminalHeight
 	}
 
 	var err error
-	w, h, err = term.GetSize(syscallStdinFd())
+	w, h, err = term.GetSize(syscallStdoutFd())
 	if err != nil {
+		debugf("get terminal size error: %v", err)
 		return
 	}
 
 	// cache result
 	terminalWidth, terminalHeight = w, h
+	debugf("get terminal size: %d,%d", w, h)
 	return
 }
 

x/termenv/util_test.go

@@ -8,6 +8,8 @@ import (
 )
 
 func TestCurrentShell(t *testing.T) {
+	assert.NotNil(t, termenv.IsTerminal())
+
 	path := termenv.CurrentShell(true)
 
 	if path != "" {