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

Fix panic when color is disabled and header lines contain ANSI colors

Browse Source 
Close #732
This commit is contained in:
Junegunn Choi 2016-11-09 12:05:45 +09:00
parent a221c672fb
commit 7ce427ff47
No known key found for this signature in database
GPG Key ID: 254BC280FEF9C627
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/result.go
View File

@ -147,19 +147,21 @@ func (result *Result) colorOffsets(matchOffsets []Offset, theme *tui.ColorTheme,
} else { } else {
ansi := itemColors[curr-1] ansi := itemColors[curr-1]
fg := ansi.color.fg fg := ansi.color.fg
if fg == -1 {
if current {
fg = theme.Current
} else {
fg = theme.Fg
}
}
bg := ansi.color.bg bg := ansi.color.bg
if bg == -1 { if theme != nil {
if current { if fg == -1 {
bg = theme.DarkBg if current {
} else { fg = theme.Current
bg = theme.Bg } else {
fg = theme.Fg
}
}
if bg == -1 {
if current {
bg = theme.DarkBg
} else {
bg = theme.Bg
}
} }
} }
colors = append(colors, colorOffset{ colors = append(colors, colorOffset{