Skip to content

Term hist UI tweaks #60076

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+36 −20
Open

Term hist UI tweaks #60076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f0f822
Fix string indexing with repl history filters
tecosaur Oct 25, 2025
e117413
Retire > history search mode in favour of prefix>
tecosaur Nov 7, 2025
34bbe85
Fix ;-escaping in the final history search segment
tecosaur 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
46 changes: 30 additions & 16 deletions stdlib/REPL/src/History/resumablefiltering.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const FILTER_SEPARATOR = ';'

List of single-character prefixes that set search modes.
"""
const FILTER_PREFIXES = ('!', '`', '=', '/', '~', '>')
const FILTER_PREFIXES = ('!', '`', '=', '/', '~')

"""
FILTER_SHORTHELP_QUERY
Expand Down Expand Up @@ -53,20 +53,22 @@ const FILTER_SHORTHELP = S"""

See more information on behaviour and keybindings with '{REPL_History_search_prefix:??}'.

By default, each word in the search string is looked for in any order.
Should the search string start with {REPL_History_search_prefix:xyz>}, then only xyz-mode entries are considered.

Different search modes are available via prefixes, as follows:
{emphasis:•} {REPL_History_search_prefix:=} looks for exact matches
{emphasis:•} {REPL_History_search_prefix:!} {italic:excludes} exact matches
{emphasis:•} {REPL_History_search_prefix:/} performs a regexp search
{emphasis:•} {REPL_History_search_prefix:~} looks for fuzzy matches
{emphasis:•} {REPL_History_search_prefix:>} looks for a particular REPL mode
{emphasis:•} {REPL_History_search_prefix:`} looks for an initialism (text with matching initials)

You can also apply multiple restrictions with the separator '{REPL_History_search_separator:$FILTER_SEPARATOR}'.

For example, {region:{REPL_History_search_prefix:/}^foo{REPL_History_search_separator:$FILTER_SEPARATOR}\
{REPL_History_search_prefix:`}bar{REPL_History_search_separator:$FILTER_SEPARATOR}\
{REPL_History_search_prefix:>}shell} will look for history entries that start with "{code:foo}",
contains "{code:b... a... r...}", {italic:and} is a shell history entry.
{REPL_History_search_prefix:shell>}} will look for history entries that start with "{code:foo}",
contains "{code:b... a... r...}", {italic:and} are a shell history entry.
"""

const FILTER_LONGHELP = S"""
Expand Down Expand Up @@ -108,9 +110,9 @@ function ConditionSet(spec::S) where {S <: AbstractString}
function addcond!(condset::ConditionSet, cond::SubString)
isempty(cond) && return
kind = first(cond)
if kind ∈ ('!', '=', '`', '/', '>', '~')
if kind ∈ ('!', '=', '`', '/', '~')
value = @view cond[2:end]
if kind ∈ ('`', '>', '~')
if kind ∈ ('`', '~')
value = strip(value)
elseif !all(isspace, value)
value = if kind == '/'
Expand All @@ -128,16 +130,23 @@ function ConditionSet(spec::S) where {S <: AbstractString}
push!(condset.initialisms, value)
elseif startswith(cond, '/')
push!(condset.regexps, value)
elseif startswith(cond, '>')
push!(condset.modes, SubString(lowercase(value)))
elseif startswith(cond, '~')
push!(condset.fuzzy, value)
end
else
if startswith(cond, '\\') && !(length(cond) > 1 && cond[2] == '\\')
cond = @view cond[2:end]
else
rang = something(findfirst('>', cond), typemax(Int))
if rang == something(findfirst(isspace, cond), ncodeunits(cond) + 1) - 1
mode = @view cond[1:prevind(cond, rang)]
push!(condset.modes, SubString(lowercase(mode)))
cond = @view cond[rang + 1:end]
end
end
push!(condset.words, strip(cond))
cond = strip(cond)
isempty(cond) && return
push!(condset.words, cond)
end
nothing
end
Expand All @@ -155,22 +164,27 @@ function ConditionSet(spec::S) where {S <: AbstractString}
elseif chr == '\\'
escaped = true
elseif chr == FILTER_SEPARATOR
str = SubString(spec, mark:pos - 1)
if !isempty(dropbytes)
str = SubString(convert(S, String(deleteat!(collect(codeunits(str)), dropbytes))))
str = if isempty(dropbytes)
SubString(spec, mark:prevind(spec, pos))
else
subbytes = deleteat!(codeunits(spec)[mark:pos-1], dropbytes)
empty!(dropbytes)
SubString(convert(S, String(subbytes)))
end
addcond!(cset, lstrip(str))
mark = pos + 1
end
pos = nextind(spec, pos)
end
if mark <= lastind
str = SubString(spec, mark:pos - 1)
if !isempty(dropbytes)
str = SubString(convert(S, String(deleteat!(collect(codeunits(str)), dropbytes))))
str = if isempty(dropbytes)
SubString(spec, mark)
else
subbytes = deleteat!(codeunits(spec)[mark:end], dropbytes)
empty!(dropbytes)
SubString(convert(S, String(subbytes)))
end
addcond!(cset, lstrip(SubString(spec, mark:lastind)))
addcond!(cset, lstrip(str))
end
cset
end
Expand Down
10 changes: 6 additions & 4 deletions stdlib/REPL/test/history.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ end
@test cset.regexps == [SubString("foo.*bar")]
end
@testset "Mode" begin
cset = ConditionSet(">shell")
cset = ConditionSet("shell>")
@test cset.modes == [SubString("shell")]
end
@testset "Fuzzy" begin
Expand All @@ -231,9 +231,11 @@ end
cset = ConditionSet("hello\\;world;=exact")
@test cset.words == [SubString("hello;world")]
@test cset.exacts == [SubString("exact")]
cset = ConditionSet("1 \\; 2")
@test cset.words == [SubString("1 ; 2")]
end
@testset "Complex query" begin
cset = ConditionSet("some = words ;; !error ;> julia;/^def.*;")
cset = ConditionSet("some = words ;; !error ; julia> ;/^def.*;")
@test cset.words == [SubString("some = words")]
@test cset.negatives == [SubString("error")]
@test cset.modes == [SubString("julia")]
Expand All @@ -254,7 +256,7 @@ end
@test isempty(spec2.regexps)
end
@testset "Complex query" begin
cset = ConditionSet("=exact;!neg;/foo.*bar;>julia")
cset = ConditionSet("=exact;!neg;/foo.*bar;julia>")
spec = FilterSpec(cset)
@test spec.exacts == ["exact"]
@test spec.negatives == ["neg"]
Expand Down Expand Up @@ -332,7 +334,7 @@ end
end
@testset "Mode" begin
empty!(results)
cset = ConditionSet(">shell")
cset = ConditionSet("shell>")
spec = FilterSpec(cset)
@test filterchunkrev!(results, entries, spec) == 0
@test results == [entries[7]]
Expand Down