VimPlug/fzf
1
0
Fork 0
mirror of https://github.com/junegunn/fzf.git synced 2026-02-27 12:02:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix filterSelection timing: only consume flag on new search results

Browse Source 
Move the filterSelection check inside the revision-change guard so a
stale EvtSearchFin from a previous search cannot consume the flag
before the retransformed search results arrive.
This commit is contained in:
Junegunn Choi
2026-02-24 21:42:26 +09:00
parent e7d591af7e
commit e4ebf18508
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/terminal.go
View File

@@ -1860,19 +1860,22 @@ func (t *Terminal) UpdateList(result MatchResult) {
}
t.revision = newRevision
t.version++
}
if t.filterSelection && t.multi > 0 && len(t.selected) > 0 {
t.filterSelection = false
matchMap := t.resultMerger.ToMap()
filtered := make(map[int32]selectedItem)
for k, v := range t.selected {
if _, matched := matchMap[k]; matched {
filtered[k] = v
// Filter out selections that no longer match after with-nth change.
// Must be inside the revision check so we don't consume the flag
// on a stale EvtSearchFin from a previous search.
if t.filterSelection && t.multi > 0 && len(t.selected) > 0 {
matchMap := t.resultMerger.ToMap()
filtered := make(map[int32]selectedItem)
for k, v := range t.selected {
if _, matched := matchMap[k]; matched {
filtered[k] = v
}
}
t.selected = filtered
}
t.selected = filtered
t.filterSelection = false
}
t.filterSelection = false
if t.triggerLoad {
t.triggerLoad = false
t.eventChan <- tui.Load.AsEvent()