Skip to content
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

fix invalidations in REPL LineEdit.jl from Static.jl #46548

Merged
merged 2 commits into from
Aug 31, 2022
Merged

fix invalidations in REPL LineEdit.jl from Static.jl #46548

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b01c91
fix invalidations in REPL LineEdit.jl from Static.jl
ranocha Aug 30, 2022
1479602
apply suggestion of KristofferC
ranocha Aug 31, 2022
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
Next Next commit
fix invalidations in REPL LineEdit.jl from Static.jl
  • Loading branch information
@ranocha
ranocha authored Aug 30, 2022
commit 5b01c91019cdc63cfe7dff140aeb29318c5566f0
4 changes: 2 additions & 2 deletions stdlib/REPL/src/LineEdit.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1548,7 +1548,7 @@ function normalize_keys(keymap::Union{Dict{Char,Any},AnyDict})
return ret
end

function add_nested_key!(keymap::Dict, key::Union{String, Char}, value; override = false)
function add_nested_key!(keymap::Dict, key::Union{String, Char}, value; override::Bool = false)
ranocha marked this conversation as resolved.
Show resolved Hide resolved
y = iterate(key)
while y !== nothing
c, i = y
Expand All @@ -1560,7 +1560,7 @@ function add_nested_key!(keymap::Dict, key::Union{String, Char}, value; override
if y === nothing
keymap[c] = value
break
elseif !(c in keys(keymap) && isa(keymap[c], Dict))
elseif !((c in keys(keymap))::Bool && isa(keymap[c], Dict))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not at all familiar with the invalidation business, but judging from the recurrent patterns: the negation acts on the two expressions whose final value is passed to !, so are you sure you don't need

Suggested change
elseif !((c in keys(keymap))::Bool && isa(keymap[c], Dict))
elseif !((c in keys(keymap) && isa(keymap[c], Dict))::Bool)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I checked with Cthulu and the problem was that c in keys(keymap) was inferred as Any.

keymap[c] = Dict{Char,Any}()
end
keymap = keymap[c]
Expand Down