Do not ignore current query when input is hidden

* The initial query given by --query should be respected
* The current query should still be respected after `hide-input`
  (or `toggle-input)

Fix #4327

2 files changed, 11 insertions, 4 deletions

diff --git a/src/terminal.go b/src/terminal.go
index 0182d196..03af52a0 100644
--- a/src/terminal.go
+++ b/src/terminal.go
@@ -1418,10 +1418,7 @@ func (t *Terminal) Input() (bool, []rune) {
 	t.mutex.Lock()
 	defer t.mutex.Unlock()
 	paused := t.paused
-	var src []rune
-	if !t.inputless {
-		src = t.input
-	}
+	src := t.input
 	if t.inputOverride != nil {
 		paused = false
 		src = *t.inputOverride
diff --git a/test/test_core.rb b/test/test_core.rb
index 235fe52a..ade644a2 100644
--- a/test/test_core.rb
+++ b/test/test_core.rb
@@ -1856,4 +1856,14 @@ class TestCore < TestInteractive
     tmux.send_keys :Space
     tmux.until { |lines| assert_includes lines[line + 2], "> 5" }
   end
+
+  def test_no_input_query
+    tmux.send_keys %(seq 1000 | #{FZF} --no-input --query 555 --bind space:toggle-input), :Enter
+    tmux.until { |lines| assert_includes lines, '> 555' }
+    tmux.send_keys :Space
+    tmux.until do |lines|
+      assert_equal 1, lines.match_count
+      assert_includes lines, '> 555'
+    end
+  end
 end