Merge pull request #848 from yorukot/develop

Replace mattn/rundwidth with ansi package more robust StringWidth

Author: lazysegtree

gomod2nix.toml

@@ -65,8 +65,8 @@ schema = 3
     version = "v1.11.5"
     hash = "sha256-jN5+2ED+YbIoPIuyJ4Ou5pqJb2w1uNKzp5yTjKY6rEQ="
   [mod."github.com/ebitengine/purego"]
-    version = "v0.8.2"
-    hash = "sha256-f3Q8KVX+RkHa1EsGF+U8E9MHHOCZ9j2jtMJOTPCZw08="
+    version = "v0.8.3"
+    hash = "sha256-JWKkqPOAa3Unq9eZrdyTjL13vZ07DDQh43IcpgCuze4="
   [mod."github.com/erikgeiser/coninput"]
     version = "v0.0.0-20211004153227-1c3628e74d0f"
     hash = "sha256-OWSqN1+IoL73rWXWdbbcahZu8n2al90Y3eT5Z0vgHvU="

src/internal/common/load_config.go

@@ -10,7 +10,7 @@ import (
 	"reflect"
 	"runtime"
 
-	"github.com/mattn/go-runewidth"
+	"github.com/charmbracelet/x/exp/term/ansi"
 	"github.com/pelletier/go-toml/v2"
 	"github.com/yorukot/superfile/src/internal/utils"
 
@@ -46,34 +46,34 @@ func ValidateConfig(c *ConfigType) error {
 		return errors.New(LoadConfigError("default_sort_type"))
 	}
 
-	if runewidth.StringWidth(c.BorderTop) != 1 {
+	if ansi.StringWidth(c.BorderTop) != 1 {
 		return errors.New(LoadConfigError("border_top"))
 	}
-	if runewidth.StringWidth(c.BorderBottom) != 1 {
+	if ansi.StringWidth(c.BorderBottom) != 1 {
 		return errors.New(LoadConfigError("border_bottom"))
 	}
-	if runewidth.StringWidth(c.BorderLeft) != 1 {
+	if ansi.StringWidth(c.BorderLeft) != 1 {
 		return errors.New(LoadConfigError("border_left"))
 	}
-	if runewidth.StringWidth(c.BorderRight) != 1 {
+	if ansi.StringWidth(c.BorderRight) != 1 {
 		return errors.New(LoadConfigError("border_right"))
 	}
-	if runewidth.StringWidth(c.BorderBottomLeft) != 1 {
+	if ansi.StringWidth(c.BorderBottomLeft) != 1 {
 		return errors.New(LoadConfigError("border_bottom_left"))
 	}
-	if runewidth.StringWidth(c.BorderBottomRight) != 1 {
+	if ansi.StringWidth(c.BorderBottomRight) != 1 {
 		return errors.New(LoadConfigError("border_bottom_right"))
 	}
-	if runewidth.StringWidth(c.BorderTopLeft) != 1 {
+	if ansi.StringWidth(c.BorderTopLeft) != 1 {
 		return errors.New(LoadConfigError("border_top_left"))
 	}
-	if runewidth.StringWidth(c.BorderTopRight) != 1 {
+	if ansi.StringWidth(c.BorderTopRight) != 1 {
 		return errors.New(LoadConfigError("border_top_right"))
 	}
-	if runewidth.StringWidth(c.BorderMiddleLeft) != 1 {
+	if ansi.StringWidth(c.BorderMiddleLeft) != 1 {
 		return errors.New(LoadConfigError("border_middle_left"))
 	}
-	if runewidth.StringWidth(c.BorderMiddleRight) != 1 {
+	if ansi.StringWidth(c.BorderMiddleRight) != 1 {
 		return errors.New(LoadConfigError("border_middle_right"))
 	}
 

src/internal/ui/rendering/border.go

@@ -3,8 +3,6 @@ package rendering
 import (
 	"strings"
 
-	"github.com/mattn/go-runewidth"
-
 	"github.com/charmbracelet/x/exp/term/ansi"
 
 	"github.com/charmbracelet/lipgloss"
@@ -51,7 +49,7 @@ func (b *BorderConfig) AreInfoItemsTruncated() bool {
 	// border.MiddleLeft <content> border.MiddleRight border.Bottom
 	availWidth := actualWidth/cnt - 3
 	for i := range b.infoItems {
-		if runewidth.StringWidth(b.infoItems[i]) > availWidth {
+		if ansi.StringWidth(b.infoItems[i]) > availWidth {
 			return true
 		}
 	}
@@ -82,8 +80,8 @@ func (b *BorderConfig) GetBorder(borderStrings lipgloss.Border) lipgloss.Border
 		titleAvailWidth := actualWidth - 4
 
 		// Basic Right truncation
-		truncatedTitle := runewidth.Truncate(b.title, titleAvailWidth, "")
-		remainingWidth := actualWidth - 4 - runewidth.StringWidth(truncatedTitle)
+		truncatedTitle := ansi.Truncate(b.title, titleAvailWidth, "")
+		remainingWidth := actualWidth - 4 - ansi.StringWidth(truncatedTitle)
 
 		margin := ""
 		if remainingWidth > b.titleLeftMargin {
@@ -104,12 +102,12 @@ func (b *BorderConfig) GetBorder(borderStrings lipgloss.Border) lipgloss.Border
 		availWidth := actualWidth/cnt - 3
 		infoText := ""
 		for _, item := range b.infoItems {
-			item = runewidth.Truncate(item, availWidth, "")
+			item = ansi.Truncate(item, availWidth, "")
 			infoText += borderStrings.MiddleRight + item + borderStrings.MiddleLeft + borderStrings.Bottom
 		}
 
 		// Fill the rest with border char.
-		remainingWidth := actualWidth - runewidth.StringWidth(infoText)
+		remainingWidth := actualWidth - ansi.StringWidth(infoText)
 
 		res.Bottom = strings.Repeat(borderStrings.Bottom, remainingWidth) + infoText
 	}