sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-08-06 11:02:41 +03:00
Code Activity

Fix Decolorise to also strip hyperlinks

Browse Source 
This is needed so that the information view is correctly aligned when we add
hyperlinks to it.
This commit is contained in:
Stefan Haller
2024-08-16 12:23:57 +02:00
parent fb97c30080
commit b411897a5a
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/utils/color.go
View File

@@ -25,7 +25,9 @@ func Decolorise(str string) string {
} }
re := regexp.MustCompile(`\x1B\[([0-9]{1,3}(;[0-9]{1,3})*)?[mGK]`) re := regexp.MustCompile(`\x1B\[([0-9]{1,3}(;[0-9]{1,3})*)?[mGK]`)
linkRe := regexp.MustCompile(`\x1B]8;[^;]*;(.*?)(\x1B.|\x07)`)
ret := re.ReplaceAllString(str, "") ret := re.ReplaceAllString(str, "")
ret = linkRe.ReplaceAllString(ret, "")
decoloriseMutex.Lock() decoloriseMutex.Lock()
decoloriseCache[str] = ret decoloriseCache[str] = ret

6
pkg/utils/color_test.go
View File

@@ -2,6 +2,8 @@ package utils
import ( import (
"testing" "testing"
"github.com/jesseduffield/lazygit/pkg/gui/style"
) )
func TestDecolorise(t *testing.T) { func TestDecolorise(t *testing.T) {
@@ -189,6 +191,10 @@ func TestDecolorise(t *testing.T) {
input: "\x1b[38;2;157;205;18mta\x1b[0m", input: "\x1b[38;2;157;205;18mta\x1b[0m",
output: "ta", output: "ta",
}, },
{
input: "a_" + style.PrintSimpleHyperlink("xyz") + "_b",
output: "a_xyz_b",
},
} }
for _, test := range tests { for _, test := range tests {