From cb9238dc4ee6ee8c9d25fa0c1f6d731b379de9b1 Mon Sep 17 00:00:00 2001
From: Junegunn Choi <junegunn.c@gmail.com>
Date: Fri, 3 Mar 2017 02:26:30 +0900
Subject: [PATCH] Display -S if sort is disabled and toggle-sort is used
This is to address a common confusion that one does not realize that
sorting is intentionally turned off by default and can be enabled by
a bind key.
---
src/terminal.go | 4 ++--
test/test_go.rb | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/terminal.go b/src/terminal.go
index c7c21c4f..f556badd 100644
--- a/src/terminal.go
+++ b/src/terminal.go
@@ -658,9 +658,9 @@ func (t *Terminal) printInfo() {
output := fmt.Sprintf("%d/%d", t.merger.Length(), t.count)
if t.toggleSort {
if t.sort {
- output += "/S"
+ output += " +S"
} else {
- output += " "
+ output += " -S"
}
}
if t.multi && len(t.selected) > 0 {
diff --git a/test/test_go.rb b/test/test_go.rb
index 582b10b2..04703757 100644
--- a/test/test_go.rb
+++ b/test/test_go.rb
@@ -513,11 +513,11 @@ class TestGoFZF < TestBase
tmux.send_keys "seq 1 111 | #{fzf "-m +s --tac #{opt} -q11"}", :Enter
tmux.until { |lines| lines[-3].include? '> 111' }
tmux.send_keys :Tab
- tmux.until { |lines| lines[-2].include? '4/111 (1)' }
+ tmux.until { |lines| lines[-2].include? '4/111 -S (1)' }
tmux.send_keys 'C-R'
tmux.until { |lines| lines[-3].include? '> 11' }
tmux.send_keys :Tab
- tmux.until { |lines| lines[-2].include? '4/111/S (2)' }
+ tmux.until { |lines| lines[-2].include? '4/111 +S (2)' }
tmux.send_keys :Enter
assert_equal ['111', '11'], readonce.split($/)
end
--
GitLab