tweak

Author: tecosaur

stdlib/REPL/src/History/resumablefiltering.jl

@@ -229,9 +229,7 @@ function filterchunkrev!(out::Vector{HistEntry}, candidates::DenseVector{HistEnt
             end
             matchfail && continue
             pushfirst!(out, entry)
-            if length(out) == maxresults
-                break
-            end
+            length(out) == maxresults && break
         end
     end
     max(0, idx - 1)

stdlib/REPL/src/History/search.jl

@@ -134,8 +134,6 @@ function run_display!((; term, pstate), events::Channel{Symbol}, hist::Vector{Hi
                 for act in prevstate.selection.active
                     push!(state.selection.gathered, prevstate.candidates[act])
                 end
-                filter!(g -> isempty(searchsorted(state.candidates, g, by = e -> e.index)),
-                        state.selection.gathered)
                 sort!(state.selection.gathered, by = e -> e.index)
                 state = SelectorState(
                     state.area, state.query, state.filter, state.candidates,
@@ -157,9 +155,9 @@ function run_display!((; term, pstate), events::Channel{Symbol}, hist::Vector{Hi
             end
             # Start filtering candidates
             filter_idx = filterchunkrev!(
-                state.candidates, cands_current, state.filter;
+                state, cands_current;
                 maxtime = time() + 0.01,
-                maxresults = 2 * outsize[1] ÷ 3)
+                maxresults = outsize[1])
             if filter_idx == 0
                 cands_cachestate = addcache!(
                     cands_cache, cands_cachestate, cands_cond => state.candidates)
@@ -187,15 +185,15 @@ function run_display!((; term, pstate), events::Channel{Symbol}, hist::Vector{Hi
                 state.area, state.query, state.filter, cands_temp,
                 state.scroll, state.selection, state.hover)
             filter_idx = filterchunkrev!(
-                state.candidates, cands_current, state.filter, filter_idx;
+                state, cands_current, filter_idx;
                 maxtime = time() + 0.01)
             if filter_idx == 0
                 cands_cachestate = addcache!(
                     cands_cache, cands_cachestate, cands_cond => state.candidates)
             end
             # If there are now new candidates in the view, update
             length(state.candidates) != length(prevstate.candidates) &&
-                length(state.candidates) - state.hover < outsize[1] &&
+                length(prevstate.candidates) - state.hover < outsize[1] &&
                 redisplay_all(out, prevstate, state, pstate; buf)
         elseif isnothing(event)
             yield()
@@ -204,6 +202,24 @@ function run_display!((; term, pstate), events::Channel{Symbol}, hist::Vector{Hi
     end
 end
 
+function filterchunkrev!(state::SelectorState, candidates::DenseVector{HistEntry}, idx::Int = length(candidates);
+                         maxtime::Float64 = Inf, maxresults::Int = length(candidates))
+    oldlen = length(state.candidates)
+    idx = filterchunkrev!(state.candidates, candidates, state.filter, idx;
+                          maxtime = maxtime, maxresults = maxresults)
+    newlen = length(state.candidates)
+    newcands = view(state.candidates, (oldlen + 1):newlen)
+    gfound = Int[]
+    for (i, g) in enumerate(state.selection.gathered)
+        cind = searchsorted(newcands, g, by = e -> e.index)
+        isempty(cind) && continue
+        push!(state.selection.active, oldlen + first(cind))
+        push!(gfound, i)
+    end
+    isempty(gfound) || deleteat!(state.selection.gathered, gfound)
+    idx
+end
+
 """
     movehover(state::SelectorState, backwards::Bool, page::Bool)
 
@@ -329,7 +345,7 @@ function savetext(term::Base.Terminals.TTYTerminal, content_::String)
             if ichar ∈ ('\x03', '\x18') || char == ichar == '\e'
                 println(out, S"\e[1G\e[2K{light,grey:{bold:history>} {red:×} History selection aborted}\n")
                 return
-            elseif char == '\r'
+            elseif ichar == '\r'
                 break
             end
             char = ichar