Llewellyn/fzf
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/fzf.git synced 2025-01-03 15:17:25 +00:00
Code Issues Projects Releases Wiki Activity

Fix crash when preview window is hidden on focus event

Browse Source
This commit is contained in:
Junegunn Choi 2023-11-17 19:13:37 +09:00
parent 7320b7df62
commit 29e67d307a
No known key found for this signature in database
GPG Key ID: 254BC280FEF9C627
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/terminal.go
View File

@ -475,6 +475,7 @@ type searchRequest struct {
type previewRequest struct { type previewRequest struct {
template string template string
pwindow tui.Window
pwindowSize tui.TermSize pwindowSize tui.TermSize
scrollOffset int scrollOffset int
list []*Item list []*Item
@ -2794,6 +2795,7 @@ func (t *Terminal) Loop() {
for { for {
var items []*Item var items []*Item
var commandTemplate string var commandTemplate string
var pwindow tui.Window
var pwindowSize tui.TermSize var pwindowSize tui.TermSize
initialOffset := 0 initialOffset := 0
t.previewBox.Wait(func(events *util.Events) { t.previewBox.Wait(func(events *util.Events) {
@ -2804,6 +2806,7 @@ func (t *Terminal) Loop() {
commandTemplate = request.template commandTemplate = request.template
initialOffset = request.scrollOffset initialOffset = request.scrollOffset
items = request.list items = request.list
pwindow = request.pwindow
pwindowSize = request.pwindowSize pwindowSize = request.pwindowSize
} }
} }
@ -2823,8 +2826,8 @@ func (t *Terminal) Loop() {
env = append(env, "FZF_PREVIEW_"+lines) env = append(env, "FZF_PREVIEW_"+lines)
env = append(env, columns) env = append(env, columns)
env = append(env, "FZF_PREVIEW_"+columns) env = append(env, "FZF_PREVIEW_"+columns)
env = append(env, fmt.Sprintf("FZF_PREVIEW_TOP=%d", t.tui.Top()+t.pwindow.Top())) env = append(env, fmt.Sprintf("FZF_PREVIEW_TOP=%d", t.tui.Top()+pwindow.Top()))
env = append(env, fmt.Sprintf("FZF_PREVIEW_LEFT=%d", t.pwindow.Left())) env = append(env, fmt.Sprintf("FZF_PREVIEW_LEFT=%d", pwindow.Left()))
} }
cmd.Env = env cmd.Env = env
@ -2952,7 +2955,7 @@ func (t *Terminal) Loop() {
if len(command) > 0 && t.canPreview() { if len(command) > 0 && t.canPreview() {
_, list := t.buildPlusList(command, false) _, list := t.buildPlusList(command, false)
t.cancelPreview() t.cancelPreview()
t.previewBox.Set(reqPreviewEnqueue, previewRequest{command, t.pwindowSize(), t.evaluateScrollOffset(), list}) t.previewBox.Set(reqPreviewEnqueue, previewRequest{command, t.pwindow, t.pwindowSize(), t.evaluateScrollOffset(), list})
} }
} }
@ -3250,7 +3253,7 @@ func (t *Terminal) Loop() {
if valid { if valid {
t.cancelPreview() t.cancelPreview()
t.previewBox.Set(reqPreviewEnqueue, t.previewBox.Set(reqPreviewEnqueue,
previewRequest{t.previewOpts.command, t.pwindowSize(), t.evaluateScrollOffset(), list}) previewRequest{t.previewOpts.command, t.pwindow, t.pwindowSize(), t.evaluateScrollOffset(), list})
} }
} else { } else {
// Discard the preview content so that it won't accidentally appear // Discard the preview content so that it won't accidentally appear

7
test/test_go.rb
View File

@ -3020,6 +3020,13 @@ class TestGoFZF < TestBase
tmux.send_keys :x tmux.send_keys :x
tmux.until { |lines| assert(lines.any? { |line| line.include?('[x-foo]') }) } tmux.until { |lines| assert(lines.any? { |line| line.include?('[x-foo]') }) }
end end
def test_preview_window_hidden_on_focus
tmux.send_keys "seq 3 | #{FZF} --preview 'echo {}' --bind focus:hide-preview", :Enter
tmux.until { |lines| assert_includes lines, '> 1' }
tmux.send_keys :Up
tmux.until { |lines| assert_includes lines, '> 2' }
end
end end
module TestShell module TestShell