Merge f70718201b into bcda25a513

src/core.go

@@ -75,6 +75,7 @@ func Run(opts *Options) (int, error) {
 			}
 			item.text, item.colors = ansiProcessor(data)
 			item.text.Index = itemIndex
+			item.origText = &data
 			itemIndex++
 			return true
 		})

src/options.go

@@ -315,6 +315,7 @@ type Options struct {
 	Criteria     []criterion
 	Multi        int
 	Ansi         bool
+	KeepAnsi     bool
 	Mouse        bool
 	Theme        *tui.ColorTheme
 	Black        bool
@@ -1926,6 +1927,8 @@ func parseOptions(opts *Options, allArgs []string) error {
 			opts.Multi = 0
 		case "--ansi":
 			opts.Ansi = true
+		case "--keep-ansi":
+			opts.KeepAnsi = true
 		case "--no-ansi":
 			opts.Ansi = false
 		case "--no-mouse":

src/terminal.go

@@ -245,6 +245,7 @@ type Terminal struct {
 	scrollbar          string
 	previewScrollbar   string
 	ansi               bool
+	keepAnsi           bool
 	tabstop            int
 	margin             [4]sizeSpec
 	padding            [4]sizeSpec
@@ -769,6 +770,7 @@ func NewTerminal(opts *Options, eventBox *util.EventBox, executor *util.Executor
 		header0:            opts.Header,
 		ellipsis:           opts.Ellipsis,
 		ansi:               opts.Ansi,
+		keepAnsi:           opts.KeepAnsi,
 		tabstop:            opts.Tabstop,
 		hasResultActions:   false,
 		hasFocusActions:    false,
@@ -1163,16 +1165,17 @@ func (t *Terminal) output() bool {
 	if len(t.expect) > 0 {
 		t.printer(t.pressed)
 	}
+	stripAnsi := t.ansi && (!t.keepAnsi)
 	found := len(t.selected) > 0
 	if !found {
 		current := t.currentItem()
 		if current != nil {
-			t.printer(current.AsString(t.ansi))
+			t.printer(current.AsString(stripAnsi))
 			found = true
 		}
 	} else {
 		for _, sel := range t.sortSelected() {
-			t.printer(sel.item.AsString(t.ansi))
+			t.printer(sel.item.AsString(stripAnsi))
 		}
 	}
 	return found