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

Fix ANSI output in the presence of multibyte characters

Browse Source 
tree -C | fzf --ansi --tac
This commit is contained in:
Junegunn Choi 2015-03-22 17:19:30 +09:00
parent 9ffcd26d50
commit 618706a5f5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ansi.go
View File

@ -5,6 +5,7 @@ import (
"regexp" "regexp"
"strconv" "strconv"
"strings" "strings"
"unicode/utf8"
) )
type ansiOffset struct { type ansiOffset struct {
@ -44,7 +45,6 @@ func extractColor(str *string) (*string, []ansiOffset) {
idx := 0 idx := 0
for _, offset := range ansiRegex.FindAllStringIndex(*str, -1) { for _, offset := range ansiRegex.FindAllStringIndex(*str, -1) {
output.WriteString((*str)[idx:offset[0]]) output.WriteString((*str)[idx:offset[0]])
newLen := int32(output.Len())
newState := interpretCode((*str)[offset[0]:offset[1]], state) newState := interpretCode((*str)[offset[0]:offset[1]], state)
if !newState.equals(state) { if !newState.equals(state) {
@ -56,6 +56,7 @@ func extractColor(str *string) (*string, []ansiOffset) {
if newState.colored() { if newState.colored() {
// Append new offset // Append new offset
state = newState state = newState
newLen := int32(utf8.RuneCount(output.Bytes()))
offsets = append(offsets, ansiOffset{[2]int32{newLen, newLen}, *state}) offsets = append(offsets, ansiOffset{[2]int32{newLen, newLen}, *state})
} else { } else {
// Discard state // Discard state
@ -71,7 +72,7 @@ func extractColor(str *string) (*string, []ansiOffset) {
output.WriteString(rest) output.WriteString(rest)
if state != nil { if state != nil {
// Update last offset // Update last offset
(&offsets[len(offsets)-1]).offset[1] = int32(output.Len()) (&offsets[len(offsets)-1]).offset[1] = int32(utf8.RuneCount(output.Bytes()))
} }
} }
outputStr := output.String() outputStr := output.String()