go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-13 01:30:53 +02:00
Code Issues Releases Activity

decolorise strings before calculating padwidths

Browse Source
This commit is contained in:
Jesse Duffield Duffield
2019-02-24 17:05:17 +11:00
parent a8858cbd12
commit 639df512f3
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/utils/utils.go
View File

@ -7,6 +7,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"reflect" "reflect"
"regexp"
"strings" "strings"
"time" "time"
@ -159,6 +160,11 @@ func renderDisplayableList(items []Displayable, isFocused bool) (string, error)
return strings.Join(paddedDisplayStrings, "\n"), nil return strings.Join(paddedDisplayStrings, "\n"), nil
} }
func decolorise(str string) string {
re := regexp.MustCompile(`\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]`)
return re.ReplaceAllString(str, "")
}
func getPadWidths(stringArrays [][]string) []int { func getPadWidths(stringArrays [][]string) []int {
if len(stringArrays[0]) <= 1 { if len(stringArrays[0]) <= 1 {
return []int{} return []int{}
@ -166,8 +172,9 @@ func getPadWidths(stringArrays [][]string) []int {
padWidths := make([]int, len(stringArrays[0])-1) padWidths := make([]int, len(stringArrays[0])-1)
for i := range padWidths { for i := range padWidths {
for _, strings := range stringArrays { for _, strings := range stringArrays {
if len(strings[i]) > padWidths[i] { uncoloredString := decolorise(strings[i])
padWidths[i] = len(strings[i]) if len(uncoloredString) > padWidths[i] {
padWidths[i] = len(uncoloredString)
} }
} }
} }