Llewellyn/fzf
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/fzf.git synced 2024-11-26 14:56:30 +00:00
Code Issues Projects Releases Wiki Activity

Fix #162 - Ignore \e[K

Browse Source
This commit is contained in:
Junegunn Choi 2015-03-27 12:35:06 +09:00
parent 9bba6bd172
commit ce7d4a1c53
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile
View File

@ -18,7 +18,7 @@ BINDIR := ../bin
BINARY32 := fzf-$(GOOS)_386 BINARY32 := fzf-$(GOOS)_386
BINARY64 := fzf-$(GOOS)_amd64 BINARY64 := fzf-$(GOOS)_amd64
VERSION = $(shell fzf/$(BINARY64) --version) VERSION = $(shell fzf/$(BINARY64) --version | sed 's/-p[0-9]*//')
RELEASE32 = fzf-$(VERSION)-$(GOOS)_386 RELEASE32 = fzf-$(VERSION)-$(GOOS)_386
RELEASE64 = fzf-$(VERSION)-$(GOOS)_amd64 RELEASE64 = fzf-$(VERSION)-$(GOOS)_amd64

5
src/ansi.go
View File

@ -33,7 +33,7 @@ func (s *ansiState) equals(t *ansiState) bool {
var ansiRegex *regexp.Regexp var ansiRegex *regexp.Regexp
func init() { func init() {
ansiRegex = regexp.MustCompile("\x1b\\[[0-9;]*m") ansiRegex = regexp.MustCompile("\x1b\\[[0-9;]*[mK]")
} }
func extractColor(str *string) (*string, []ansiOffset) { func extractColor(str *string) (*string, []ansiOffset) {
@ -87,6 +87,9 @@ func interpretCode(ansiCode string, prevState *ansiState) *ansiState {
} else { } else {
state = &ansiState{prevState.fg, prevState.bg, prevState.bold} state = &ansiState{prevState.fg, prevState.bg, prevState.bold}
} }
if ansiCode[len(ansiCode)-1] == 'K' {
return state
}
ptr := &state.fg ptr := &state.fg
state256 := 0 state256 := 0

8
src/ansi_test.go
View File

@ -53,6 +53,14 @@ func TestExtractColor(t *testing.T) {
assert(offsets[0], 0, 6, -1, -1, true) assert(offsets[0], 0, 6, -1, -1, true)
}) })
src = "\x1b[1mhello \x1b[Kworld"
check(func(offsets []ansiOffset) {
if len(offsets) != 1 {
t.Fail()
}
assert(offsets[0], 0, 11, -1, -1, true)
})
src = "hello \x1b[34;45;1mworld" src = "hello \x1b[34;45;1mworld"
check(func(offsets []ansiOffset) { check(func(offsets []ansiOffset) {
if len(offsets) != 1 { if len(offsets) != 1 {

2
src/constants.go
View File

@ -5,7 +5,7 @@ import (
) )
// Current version // Current version
const Version = "0.9.5" const Version = "0.9.5-p1"
// fzf events // fzf events
const ( const (