Merge pull request #961 from rsteube/xonsh-style-order

xonsh: reverse style order
carapace-sh · Dec 18, 2023 · 1ac5077 · 1ac5077
2 parents ac69109 + b081a9a
commit 1ac5077
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/internal/shell/xonsh/style.go b/internal/shell/xonsh/style.go
@@ -10,18 +10,18 @@ func convertStyle(s string) string {
 	xonshStyle := make([]string, 0)
 
 	style := style.Parse("fg-default bg-default " + s)
-	switch style.Foreground {
+	switch style.Background {
 	case nil:
-		xonshStyle = append(xonshStyle, "fg:default")
+		xonshStyle = append(xonshStyle, "bg:default")
 	default:
-		xonshStyle = append(xonshStyle, "fg:"+convertColor(style.Foreground.String()))
+		xonshStyle = append(xonshStyle, "bg:"+convertColor(style.Background.String()))
 	}
 
-	switch style.Background {
+	switch style.Foreground {
 	case nil:
-		xonshStyle = append(xonshStyle, "bg:default")
+		xonshStyle = append(xonshStyle, "fg:default")
 	default:
-		xonshStyle = append(xonshStyle, "bg:"+convertColor(style.Background.String()))
+		xonshStyle = append(xonshStyle, "fg:"+convertColor(style.Foreground.String()))
 	}
 
 	if style.Bold {