Skip to content

only show unique entries in history search when filtering #60066

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KristofferC merged 4 commits into from
Nov 7, 2025
Merged

only show unique entries in history search when filtering #60066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8f01412
only show unique entries in history search
KristofferC Nov 6, 2025
62a4e31
fix not looking at all conten in `filterchunkrev!` and also not remov…
Nov 7, 2025
0d6e7eb
- do not filter out same string from different modes
Nov 7, 2025
aff738e
make `seen` obligatory and remove the `deduplicate` kwarg
Nov 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions stdlib/REPL/src/History/resumablefiltering.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,21 +253,25 @@ end


"""
filterchunkrev!(out, candidates, spec; idx, maxtime, maxresults) -> Int
filterchunkrev!(out, candidates, spec, seen, idx; maxtime, maxresults) -> Int

Incrementally filter `candidates[1:idx]` in reverse order.

Pushes matches onto `out` until either `maxtime` is exceeded or `maxresults`
collected, then returns the new resume index.
collected, then returns the new resume index. Only unique entries (by mode and content)
are added to avoid showing duplicate history items.
"""
function filterchunkrev!(out::Vector{HistEntry}, candidates::DenseVector{HistEntry},
spec::FilterSpec, idx::Int = length(candidates);
spec::FilterSpec, seen::Set{Tuple{Symbol,String}}, idx::Int = length(candidates);
maxtime::Float64 = Inf, maxresults::Int = length(candidates))
batchsize = clamp(length(candidates) ÷ 512, 10, 1000)
for batch in Iterators.partition(idx:-1:1, batchsize)
time() > maxtime && break
for outer idx in batch
entry = candidates[idx]
if (entry.mode, entry.content) ∈ seen
continue
end
if !isempty(spec.modes)
entry.mode ∈ spec.modes || continue
end
Expand All @@ -293,6 +297,7 @@ function filterchunkrev!(out::Vector{HistEntry}, candidates::DenseVector{HistEnt
end
end
matchfail && continue
push!(seen, (entry.mode, entry.content))
pushfirst!(out, entry)
length(out) == maxresults && break
end
Expand Down
27 changes: 20 additions & 7 deletions stdlib/REPL/src/History/search.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ function run_display!((; term, pstate), events::Channel{Symbol}, hist::Vector{Hi
cands_temp = HistEntry[]
# Filter state
filter_idx = 0
filter_seen = Set{Tuple{Symbol,String}}()
# Event loop
while true
event = @lock events if !isempty(events) take!(events) end
Expand Down Expand Up @@ -153,10 +154,21 @@ function run_display!((; term, pstate), events::Channel{Symbol}, hist::Vector{Hi
end
end
# Start filtering candidates
filter_idx = filterchunkrev!(
state, cands_current;
maxtime = time() + 0.01,
maxresults = outsize[1])
# Only deduplicate when user has entered a search query. When browsing
# with no filter (empty query), show all history including duplicates.
if isempty(filter_spec.exacts) && isempty(filter_spec.negatives) &&
isempty(filter_spec.regexps) && isempty(filter_spec.modes)
# No filtering needed, just copy all candidates
append!(state.candidates, cands_current)
filter_idx = 0
else
# Filtering needed, deduplicate results
empty!(filter_seen)
filter_idx = filterchunkrev!(
state, cands_current, filter_seen;
maxtime = time() + 0.01,
maxresults = outsize[1])
end
if filter_idx == 0
cands_cachestate = addcache!(
cands_cache, cands_cachestate, cands_cond => state.candidates)
Expand Down Expand Up @@ -186,7 +198,7 @@ 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, cands_current, filter_idx;
state, cands_current, filter_seen, filter_idx;
maxtime = time() + 0.01)
if filter_idx == 0
cands_cachestate = addcache!(
Expand All @@ -203,10 +215,11 @@ function run_display!((; term, pstate), events::Channel{Symbol}, hist::Vector{Hi
end
end

function filterchunkrev!(state::SelectorState, candidates::DenseVector{HistEntry}, idx::Int = length(candidates);
function filterchunkrev!(state::SelectorState, candidates::DenseVector{HistEntry},
seen::Set{Tuple{Symbol,String}}, idx::Int = length(candidates);
maxtime::Float64 = Inf, maxresults::Int = length(candidates))
oldlen = length(state.candidates)
idx = filterchunkrev!(state.candidates, candidates, state.filter, idx;
idx = filterchunkrev!(state.candidates, candidates, state.filter, seen, idx;
maxtime = maxtime, maxresults = maxresults)
newlen = length(state.candidates)
newcands = view(state.candidates, (oldlen + 1):newlen)
Expand Down
75 changes: 64 additions & 11 deletions stdlib/REPL/test/history.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,71 +279,124 @@ end
empty!(results)
cset = ConditionSet("hello")
spec = FilterSpec(cset)
@test filterchunkrev!(results, entries, spec) == 0
seen = Set{Tuple{Symbol,String}}()
@test filterchunkrev!(results, entries, spec, seen) == 0
@test results == [entries[1], entries[7]]
empty!(results)
cset2 = ConditionSet("world")
spec2 = FilterSpec(cset2)
@test filterchunkrev!(results, entries, spec2) == 0
empty!(seen)
@test filterchunkrev!(results, entries, spec2, seen) == 0
@test results == [entries[1], entries[7]]
empty!(results)
cset3 = ConditionSet("World")
spec3 = FilterSpec(cset3)
@test filterchunkrev!(results, entries, spec3) == 0
empty!(seen)
@test filterchunkrev!(results, entries, spec3, seen) == 0
@test results == [entries[7]]
end
@testset "Exact" begin
empty!(results)
cset = ConditionSet("=test")
spec = FilterSpec(cset)
@test filterchunkrev!(results, entries, spec, maxresults = 2) == 5
seen = Set{Tuple{Symbol,String}}()
@test filterchunkrev!(results, entries, spec, seen; maxresults = 2) == 5
@test results == [entries[6], entries[9]]
empty!(results)
cset2 = ConditionSet("=test case")
spec2 = FilterSpec(cset2)
@test filterchunkrev!(results, entries, spec2) == 0
empty!(seen)
@test filterchunkrev!(results, entries, spec2, seen) == 0
@test results == [entries[3]]
end
@testset "Negative" begin
empty!(results)
cset = ConditionSet("!hello ; !test;! cos")
spec = FilterSpec(cset)
@test filterchunkrev!(results, entries, spec) == 0
seen = Set{Tuple{Symbol,String}}()
@test filterchunkrev!(results, entries, spec, seen) == 0
@test results == [entries[2], entries[7], entries[8]]
end
@testset "Initialism" begin
empty!(results)
cset = ConditionSet("`tc")
spec = FilterSpec(cset)
@test filterchunkrev!(results, entries, spec) == 0
seen = Set{Tuple{Symbol,String}}()
@test filterchunkrev!(results, entries, spec, seen) == 0
@test results == [entries[3]]
empty!(results)
cset2 = ConditionSet("`fb")
spec2 = FilterSpec(cset2)
@test filterchunkrev!(results, entries, spec2) == 0
empty!(seen)
@test filterchunkrev!(results, entries, spec2, seen) == 0
@test results == [entries[8]]
end
@testset "Regexp" begin
empty!(results)
cset = ConditionSet("/^c.s\\b")
spec = FilterSpec(cset)
@test filterchunkrev!(results, entries, spec) == 0
seen = Set{Tuple{Symbol,String}}()
@test filterchunkrev!(results, entries, spec, seen) == 0
@test results == [entries[4], entries[5]]
end
@testset "Mode" begin
empty!(results)
cset = ConditionSet(">shell")
spec = FilterSpec(cset)
@test filterchunkrev!(results, entries, spec) == 0
seen = Set{Tuple{Symbol,String}}()
@test filterchunkrev!(results, entries, spec, seen) == 0
@test results == [entries[7]]
end
@testset "Fuzzy" begin
empty!(results)
cset = ConditionSet("~cs")
spec = FilterSpec(cset)
@test filterchunkrev!(results, entries, spec) == 0
seen = Set{Tuple{Symbol,String}}()
@test filterchunkrev!(results, entries, spec, seen) == 0
@test results == entries[3:6]
end
@testset "Uniqueness" begin
empty!(results)
# Create entries with duplicate content in the same mode
dup_entries = [
HistEntry(:julia, now(UTC), "println(\"hello\")", 1),
HistEntry(:julia, now(UTC), "cos(2π)", 2),
HistEntry(:julia, now(UTC), "println(\"hello\")", 3), # duplicate
HistEntry(:julia, now(UTC), "sin(π)", 4),
HistEntry(:julia, now(UTC), "cos(2π)", 5), # duplicate
HistEntry(:julia, now(UTC), "println(\"hello\")", 6), # duplicate
HistEntry(:julia, now(UTC), "tan(π/4)", 7),
]
# When filtering with seen Set, duplicates are removed
cset = ConditionSet("cos")
spec = FilterSpec(cset)
seen = Set{Tuple{Symbol,String}}()
@test filterchunkrev!(results, dup_entries, spec, seen) == 0
# Should only get unique entries matching the filter
# Since we iterate in reverse (7->1), we keep the most recent occurrence of each unique content
@test length(results) == 1
@test results[1] == dup_entries[5] # cos(2π) - most recent
# When browsing without filtering, duplicates are kept
empty!(results)
append!(results, dup_entries)
@test length(results) == 7 # All entries, including duplicates
@test results == dup_entries
# Test that same content in different modes is NOT deduplicated
empty!(results)
mode_entries = [
HistEntry(:julia, now(UTC), "ls", 1),
HistEntry(:shell, now(UTC), "ls", 2),
HistEntry(:julia, now(UTC), "ls", 3), # duplicate in :julia mode
HistEntry(:shell, now(UTC), "pwd", 4),
]
empty!(seen)
cset3 = ConditionSet("ls")
spec3 = FilterSpec(cset3)
@test filterchunkrev!(results, mode_entries, spec3, seen) == 0
@test length(results) == 2 # "ls" from :julia and "ls" from :shell
@test results[1] == mode_entries[2] # :shell ls
@test results[2] == mode_entries[3] # :julia ls (most recent)
end
end
@testset "Strictness comparison" begin
c1 = ConditionSet("hello world")
Expand Down