Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2024-12-25 17:18:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

strwithpos uses rune position not byte position

Browse Source
This commit is contained in:
sawka 2022-11-21 16:37:09 -08:00
parent 9f7b5c8226
commit 8729d1f491
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/utilfn/utilfn.go
View File

@ -3,6 +3,7 @@ package utilfn
import ( import (
"regexp" "regexp"
"strings" "strings"
"unicode/utf8"
) )
var HexDigits = []byte{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'} var HexDigits = []byte{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'}
@ -121,7 +122,7 @@ func ContainsStr(strs []string, test string) bool {
type StrWithPos struct { type StrWithPos struct {
Str string Str string
Pos int Pos int // this is a 'rune' position (not a byte position)
} }
func (sp StrWithPos) String() string { func (sp StrWithPos) String() string {
@ -133,7 +134,7 @@ func ParseToSP(s string) StrWithPos {
if idx == -1 { if idx == -1 {
return StrWithPos{Str: s} return StrWithPos{Str: s}
} }
return StrWithPos{Str: s[0:idx] + s[idx+3:], Pos: idx} return StrWithPos{Str: s[0:idx] + s[idx+3:], Pos: utf8.RuneCountInString(s[0:idx])}
} }
func strWithCursor(str string, pos int) string { func strWithCursor(str string, pos int) string {
@ -145,7 +146,14 @@ func strWithCursor(str string, pos int) string {
return str + "_[*]" return str + "_[*]"
} }
return str + "[*]" return str + "[*]"
} else {
return str[:pos] + "[*]" + str[pos:]
} }
var rtn []rune
for _, ch := range str {
if len(rtn) == pos {
rtn = append(rtn, '[', '*', ']')
}
rtn = append(rtn, ch)
}
return string(rtn)
} }