diff --git a/src/core.go b/src/core.go index 961d0d37..dffc4f36 100644 --- a/src/core.go +++ b/src/core.go @@ -74,20 +74,11 @@ func Run(opts *Options) (int, error) { var lineAnsiState, prevLineAnsiState *ansiState if opts.Ansi { - if opts.Theme.Colored { - ansiProcessor = func(data []byte) (util.Chars, *[]ansiOffset) { - prevLineAnsiState = lineAnsiState - trimmed, offsets, newState := extractColor(byteString(data), lineAnsiState, nil) - lineAnsiState = newState - return util.ToChars(stringBytes(trimmed)), offsets - } - } else { - // When color is disabled but ansi option is given, - // we simply strip out ANSI codes from the input - ansiProcessor = func(data []byte) (util.Chars, *[]ansiOffset) { - trimmed, _, _ := extractColor(byteString(data), nil, nil) - return util.ToChars(stringBytes(trimmed)), nil - } + ansiProcessor = func(data []byte) (util.Chars, *[]ansiOffset) { + prevLineAnsiState = lineAnsiState + trimmed, offsets, newState := extractColor(byteString(data), lineAnsiState, nil) + lineAnsiState = newState + return util.ToChars(stringBytes(trimmed)), offsets } } @@ -112,7 +103,7 @@ func Run(opts *Options) (int, error) { nthTransformer := opts.WithNth(opts.Delimiter) chunkList = NewChunkList(cache, func(item *Item, data []byte) bool { tokens := Tokenize(byteString(data), opts.Delimiter) - if opts.Ansi && opts.Theme.Colored && len(tokens) > 1 { + if opts.Ansi && len(tokens) > 1 { var ansiState *ansiState if prevLineAnsiState != nil { ansiStateDup := *prevLineAnsiState diff --git a/src/result.go b/src/result.go index 3e4a81c0..acd7bb06 100644 --- a/src/result.go +++ b/src/result.go @@ -179,6 +179,9 @@ func (result *Result) colorOffsets(matchOffsets []Offset, nthOffsets []Offset, t var curr cellInfo = cellInfo{0, false, false, false} start := 0 ansiToColorPair := func(ansi ansiOffset, base tui.ColorPair) tui.ColorPair { + if !theme.Colored { + return tui.NewColorPair(-1, -1, ansi.color.attr).MergeAttr(base) + } fg := ansi.color.fg bg := ansi.color.bg if fg == -1 { @@ -200,7 +203,7 @@ func (result *Result) colorOffsets(matchOffsets []Offset, nthOffsets []Offset, t color = colBase.Merge(colMatch) } var url *url - if curr.color && theme.Colored { + if curr.color { ansi := itemColors[curr.index] url = ansi.color.url origColor := ansiToColorPair(ansi, colMatch)