Fix prompt overwrite with zero input and a one-line picker
An empty picker using adaptive height and inline info can be one row tall when
there is no input. Initialization emitted ESC[0A, which terminals interpret as
moving up one row, overwriting the preceding line.
Skip the cursor-up escape when no upward movement is needed.
Test is in test/test_layout.rb. Manual repro is easy with:
```
printf 'KEEP THIS LINE\n'; env FZF_DEFAULT_OPTS= FZF_DEFAULT_OPTS_FILE= \
fzf --style=minimal --height='~50%' --info=inline-right </dev/null
```
Before the fix, KEEP THIS LINE disappears. Afterward, it remains above the picker.
Fix #4958
This commit is contained in:
parent
4499615fe9
commit
eea2081857
3 changed files with 16 additions and 1 deletions
|
|
@ -4,6 +4,7 @@ CHANGELOG
|
|||
0.75.1
|
||||
------
|
||||
- Fixed `--info inline-right:PREFIX` leaving part of the previous output when the info gets shorter (#4953)
|
||||
- Fixed a one-line picker overwriting the line above it, e.g. `--height=~50%` with inline info and empty input (#4958) (@nhooyr)
|
||||
|
||||
0.75.0
|
||||
------
|
||||
|
|
|
|||
|
|
@ -292,7 +292,10 @@ func (r *LightRenderer) Init() error {
|
|||
}
|
||||
|
||||
r.enableModes()
|
||||
r.csi(fmt.Sprintf("%dA", r.MaxY()-1))
|
||||
// CSI 0 A means one row up, not zero rows.
|
||||
if height := r.MaxY(); height > 1 {
|
||||
r.csi(fmt.Sprintf("%dA", height-1))
|
||||
}
|
||||
r.csi("G")
|
||||
r.csi("K")
|
||||
if !r.clearOnExit && !r.fullscreen {
|
||||
|
|
|
|||
|
|
@ -187,6 +187,17 @@ class TestLayout < TestInteractive
|
|||
tmux.until { assert_block(expected, it) }
|
||||
end
|
||||
|
||||
def test_height_range_empty_input_preserves_previous_line
|
||||
tmux.send_keys %(printf 'KEEP THIS LINE\\n'; : | FZF_DEFAULT_OPTS_FILE= #{FZF} --style=minimal --height='~50%' --info=inline-right), :Enter
|
||||
tmux.until do |lines|
|
||||
assert_match(%r{0/0}, lines.last)
|
||||
assert_equal 'KEEP THIS LINE', lines[-2]
|
||||
end
|
||||
|
||||
tmux.send_keys 'C-c'
|
||||
tmux.until { |lines| assert_equal 'KEEP THIS LINE', lines.last }
|
||||
end
|
||||
|
||||
def test_height_range_fit_preview_above
|
||||
tmux.send_keys 'seq 3 | fzf --height ~100% --info=inline --border rounded --preview-window border-rounded --preview "seq {}" --preview-window up,60%', :Enter
|
||||
expected = <<~OUTPUT
|
||||
|
|
|
|||
Loading…
Reference in a new issue