Print selected items in the order they are selected

2 files changed, 48 insertions, 9 deletions

diff --git a/src/terminal.go b/src/terminal.go
index abd70690..49083f7d 100644
--- a/src/terminal.go
+++ b/src/terminal.go
@@ -30,7 +30,7 @@ type Terminal struct {
 	progress   int
 	reading    bool
 	merger     *Merger
-	selected   map[*string]*string
+	selected   map[*string]selectedItem
 	reqBox     *util.EventBox
 	eventBox   *util.EventBox
 	mutex      sync.Mutex
@@ -38,6 +38,25 @@ type Terminal struct {
 	suppress   bool
 }
 
+type selectedItem struct {
+	at   time.Time
+	text *string
+}
+
+type ByTimeOrder []selectedItem
+
+func (a ByTimeOrder) Len() int {
+	return len(a)
+}
+
+func (a ByTimeOrder) Swap(i, j int) {
+	a[i], a[j] = a[j], a[i]
+}
+
+func (a ByTimeOrder) Less(i, j int) bool {
+	return a[i].at.Before(a[j].at)
+}
+
 var _spinner = []string{`-`, `\`, `|`, `/`, `-`, `\`, `|`, `/`}
 
 const (
@@ -70,7 +89,7 @@ func NewTerminal(opts *Options, eventBox *util.EventBox) *Terminal {
 		multi:      opts.Multi,
 		printQuery: opts.PrintQuery,
 		merger:     EmptyMerger,
-		selected:   make(map[*string]*string),
+		selected:   make(map[*string]selectedItem),
 		reqBox:     util.NewEventBox(),
 		eventBox:   eventBox,
 		mutex:      sync.Mutex{},
@@ -139,12 +158,13 @@ func (t *Terminal) output() {
 			fmt.Println(t.merger.Get(t.listIndex(t.cy)).AsString())
 		}
 	} else {
-		for ptr, orig := range t.selected {
-			if orig != nil {
-				fmt.Println(*orig)
-			} else {
-				fmt.Println(*ptr)
-			}
+		sels := make([]selectedItem, 0, len(t.selected))
+		for _, sel := range t.selected {
+			sels = append(sels, sel)
+		}
+		sort.Sort(ByTimeOrder(sels))
+		for _, sel := range sels {
+			fmt.Println(*sel.text)
 		}
 	}
 }
@@ -444,7 +464,13 @@ func (t *Terminal) Loop() {
 			if idx < t.merger.Length() {
 				item := t.merger.Get(idx)
 				if _, found := t.selected[item.text]; !found {
-					t.selected[item.text] = item.origText
+					var strptr *string
+					if item.origText != nil {
+						strptr = item.origText
+					} else {
+						strptr = item.text
+					}
+					t.selected[item.text] = selectedItem{time.Now(), strptr}
 				} else {
 					delete(t.selected, item.text)
 				}
diff --git a/test/test_go.rb b/test/test_go.rb
index a499a92f..26d7a04d 100644
--- a/test/test_go.rb
+++ b/test/test_go.rb
@@ -189,5 +189,18 @@ class TestGoFZF < MiniTest::Unit::TestCase
     tmux.until { |lines| lines.last !~ /^>/ }
     tmux.close
   end
+
+  def test_fzf_multi_order
+    tmux.send_keys "seq 1 10 | fzf --multi > #{tempname}", :Enter
+    tmux.until { |lines| lines.last =~ /^>/ }
+
+    tmux.send_keys :Tab, :Up, :Up, :Tab, :Tab, :Tab, # 3, 2
+                   'C-K', 'C-K', 'C-K', 'C-K', :BTab, :BTab, # 5, 6
+                   :PgUp, 'C-J', :Down, :Tab, :Tab # 8, 7
+    tmux.until { |lines| lines[-2].include? '(6)' }
+    tmux.send_keys "C-M"
+    assert_equal %w[3 2 5 6 8 7], File.read(tempname).split($/)
+    tmux.close
+  end
 end