From 74bb51332bf1bd7277b9237b06ac6927939eceba Mon Sep 17 00:00:00 2001
From: Inhere <in.798@qq.com>
Date: Thu, 20 Jul 2023 16:14:01 +0800
Subject: [PATCH] :bug: fix: fix convert basic color to rgb color fail

---
 convert.go | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/convert.go b/convert.go
index 39aac7d..c710353 100644
--- a/convert.go
+++ b/convert.go
@@ -52,6 +52,7 @@ var (
 
 	// ---------- basic(16) <=> RGB color convert ----------
 	// refer from Hyper app
+	// Tip: only keep foreground color, background color need convert to foreground color for convert to RGB
 	basic2hexMap = map[uint8]string{
 		30: "000000", // black
 		31: "c51e14", // red
@@ -61,7 +62,7 @@ var (
 		35: "c839c5", // magenta
 		36: "20c5c6", // cyan
 		37: "c7c7c7", // white
-		// - don't add bg color
+		// - don't add bg color, convert to fg color for convert to RGB
 		// 40:  "000000", // black
 		// 41:  "c51e14", // red
 		// 42:  "1dc121", // green
@@ -428,10 +429,11 @@ func HexToRGB(hex string) []int { return HexToRgb(hex) }
 // HexToRgb convert hex color string to RGB numbers
 //
 // Usage:
-// 	rgb := HexToRgb("ccc") // rgb: [204 204 204]
-// 	rgb := HexToRgb("aabbcc") // rgb: [170 187 204]
-// 	rgb := HexToRgb("#aabbcc") // rgb: [170 187 204]
-// 	rgb := HexToRgb("0xad99c0") // rgb: [170 187 204]
+//
+//	rgb := HexToRgb("ccc") // rgb: [204 204 204]
+//	rgb := HexToRgb("aabbcc") // rgb: [170 187 204]
+//	rgb := HexToRgb("#aabbcc") // rgb: [170 187 204]
+//	rgb := HexToRgb("0xad99c0") // rgb: [170 187 204]
 func HexToRgb(hex string) (rgb []int) {
 	hex = strings.TrimSpace(hex)
 	if hex == "" {
@@ -474,6 +476,7 @@ func Rgb2hex(rgb []int) string { return RgbToHex(rgb) }
 // RgbToHex convert RGB-code to hex-code
 //
 // Usage:
+//
 //	hex := RgbToHex([]int{170, 187, 204}) // hex: "aabbcc"
 func RgbToHex(rgb []int) string {
 	hexNodes := make([]string, len(rgb))
@@ -488,10 +491,15 @@ func RgbToHex(rgb []int) string {
  * 4bit(16) color <=> RGB/True color
  *************************************************************/
 
+// BasicToHex convert basic color to hex string.
+func BasicToHex(val uint8) string {
+	val = Bg2Fg(val)
+	return basic2hexMap[val]
+}
+
 // Basic2hex convert basic color to hex string.
 func Basic2hex(val uint8) string {
-	val = Fg2Bg(val)
-	return basic2hexMap[val]
+	return BasicToHex(val)
 }
 
 // Hex2basic convert hex string to basic color code.
@@ -663,6 +671,7 @@ func C256ToRgbV1(val uint8) (rgb []uint8) {
 // returns r, g, and b in the set [0, 255].
 //
 // Usage:
+//
 //	HslIntToRgb(0, 100, 50) // red
 //	HslIntToRgb(120, 100, 50) // lime
 //	HslIntToRgb(120, 100, 25) // dark green
@@ -677,6 +686,7 @@ func HslIntToRgb(h, s, l int) (rgb []uint8) {
 // returns r, g, and b in the set [0, 255].
 //
 // Usage:
+//
 //	rgbVals := HslToRgb(0, 1, 0.5) // red
 func HslToRgb(h, s, l float64) (rgb []uint8) {
 	var r, g, b float64