m/fzf
1
0
mirror of https://github.com/junegunn/fzf.git synced 2025-11-16 15:23:48 -05:00

Fix regression of prompt display

This commit is contained in:
Junegunn Choi
2019-03-30 02:06:54 +09:00
parent 37585bd5a5
commit 07d755df11

View File

@@ -1105,6 +1105,7 @@ func (t *Terminal) printAll() {
} }
func (t *Terminal) refresh() { func (t *Terminal) refresh() {
t.placeCursor()
if !t.suppress { if !t.suppress {
windows := make([]tui.Window, 0, 4) windows := make([]tui.Window, 0, 4)
if t.bordered { if t.bordered {
@@ -1452,7 +1453,6 @@ func (t *Terminal) Loop() {
t.printPrompt() t.printPrompt()
t.printInfo() t.printInfo()
t.printHeader() t.printHeader()
t.placeCursor()
t.refresh() t.refresh()
t.mutex.Unlock() t.mutex.Unlock()
go func() { go func() {
@@ -1623,7 +1623,6 @@ func (t *Terminal) Loop() {
exit(func() int { return exitInterrupt }) exit(func() int { return exitInterrupt })
} }
} }
t.placeCursor()
t.refresh() t.refresh()
t.mutex.Unlock() t.mutex.Unlock()
}) })
@@ -1703,7 +1702,7 @@ func (t *Terminal) Loop() {
t.previewBox.Set(reqPreviewEnqueue, list) t.previewBox.Set(reqPreviewEnqueue, list)
} }
} }
req(reqList, reqInfo, reqHeader) req(reqPrompt, reqList, reqInfo, reqHeader)
} }
case actTogglePreviewWrap: case actTogglePreviewWrap:
if t.hasPreviewWindow() { if t.hasPreviewWindow() {
@@ -2012,7 +2011,6 @@ func (t *Terminal) Loop() {
t.version++ t.version++
} }
} }
t.eventBox.Set(EvtSearchNew, t.sort)
} }
if changed || t.cx != previousCx { if changed || t.cx != previousCx {
@@ -2020,6 +2018,10 @@ func (t *Terminal) Loop() {
} }
t.mutex.Unlock() // Must be unlocked before touching reqBox t.mutex.Unlock() // Must be unlocked before touching reqBox
if changed {
t.eventBox.Set(EvtSearchNew, t.sort)
}
for _, event := range events { for _, event := range events {
t.reqBox.Set(event, nil) t.reqBox.Set(event, nil)
} }