stonewareslord/fzf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Short-circuit ANSI processing if no ANSI codes are found

Browse Source 
Rework of 656963e. Makes --ansi processing around 20% faster on plain
strings without ANSI codes.
This commit is contained in:
Junegunn Choi 2017-08-18 03:04:11 +09:00
parent 8d23646fe6
commit 931c78a70c
No known key found for this signature in database
GPG Key ID: 254BC280FEF9C627
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/ansi.go
View File

@ -73,8 +73,6 @@ func extractColor(str string, state *ansiState, proc func(string, *ansiState) bo
runeCount := 0 runeCount := 0
for idx := 0; idx < len(str); { for idx := 0; idx < len(str); {
idx += findAnsiStart(str[idx:]) idx += findAnsiStart(str[idx:])
// No sign of ANSI code
if idx == len(str) { if idx == len(str) {
break break
} }
@ -117,22 +115,30 @@ func extractColor(str string, state *ansiState, proc func(string, *ansiState) bo
} }
} }
rest := str[prevIdx:] var rest string
if len(rest) > 0 { var trimmed string
if prevIdx == 0 {
// No ANSI code found
rest = str
trimmed = str
} else {
rest = str[prevIdx:]
output.WriteString(rest) output.WriteString(rest)
if state != nil { trimmed = output.String()
// Update last offset }
runeCount += utf8.RuneCountInString(rest) if len(rest) > 0 && state != nil {
(&offsets[len(offsets)-1]).offset[1] = int32(runeCount) // Update last offset
} runeCount += utf8.RuneCountInString(rest)
(&offsets[len(offsets)-1]).offset[1] = int32(runeCount)
} }
if proc != nil { if proc != nil {
proc(rest, state) proc(rest, state)
} }
if len(offsets) == 0 { if len(offsets) == 0 {
return output.String(), nil, state return trimmed, nil, state
} }
return output.String(), &offsets, state return trimmed, &offsets, state
} }
func interpretCode(ansiCode string, prevState *ansiState) *ansiState { func interpretCode(ansiCode string, prevState *ansiState) *ansiState {