ayo/kitty
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix tabs and carriage returns being incorrectly sanitized

Browse source
This commit is contained in:
Kovid Goyal 2023-03-23 13:17:33 +05:30
parent b5c2d85837
commit e774deaef1
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
2 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/cmd/diff/collect.go
View file

@ -104,7 +104,9 @@ func hash_for_path(path string) (string, error) {
}
func sanitize_control_codes(x string) string {
return utils.SanitizeControlCodes(x, "░")
// exclude newlines, carriage returns and tabs
pat := utils.MustCompile("[\x00-\x08\x0b\x0c\x0e-\x1f\x7f\u0080-\u009f]")
return pat.ReplaceAllLiteralString(x, "░")
}
func sanitize_tabs_and_carriage_returns(x string) string {

13
tools/utils/misc.go
View file

@ -4,7 +4,6 @@ package utils
import (
"fmt"
"regexp"
"sort"
"golang.org/x/exp/constraints"
@ -152,15 +151,3 @@ func Memset[T any](dest []T, pattern ...T) []T {
}
return dest
}
var ControlCodesPat = (&Once[*regexp.Regexp]{Run: func() *regexp.Regexp {
return regexp.MustCompile("[\x00-\x09\x0b-\x1f\x7f\u0080-\u009f]")
}}).Get
func SanitizeControlCodes(raw string, replace_with ...string) string {
r := ""
if len(replace_with) > 0 {
r = replace_with[0]
}
return ControlCodesPat().ReplaceAllLiteralString(raw, r)
}