Skip to content

avoid creating a new Face in get calls when FACES has that face available #77

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
merged 1 commit into from
Aug 6, 2024
Merged

avoid creating a new Face in get calls when FACES has that face available #77

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions src/faces.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ function withfaces(f, keyvals_itr)
if face isa Face
newfaces[name] = face
elseif face isa Symbol
newfaces[name] = get(FACES.current[], face, Face())
newfaces[name] = get(Face, FACES.current[], face)
elseif face isa Vector{Symbol}
newfaces[name] = Face(inherit=face)
elseif haskey(newfaces, name)
Expand Down Expand Up @@ -517,7 +517,7 @@ function Base.merge(a::Face, b::Face)
b_noinherit = Face(
b.font, b.height, b.weight, b.slant, b.foreground, b.background,
b.underline, b.strikethrough, b.inverse, Symbol[])
b_inheritance = map(fname -> get(FACES.current[], fname, Face()), Iterators.reverse(b.inherit))
b_inheritance = map(fname -> get(Face, FACES.current[], fname), Iterators.reverse(b.inherit))
b_resolved = merge(foldl(merge, b_inheritance), b_noinherit)
merge(a, b_resolved)
end
Expand All @@ -529,7 +529,7 @@ Base.merge(a::Face, b::Face, others::Face...) = merge(merge(a, b), others...)

# Putting these inside `getface` causes the julia compiler to box it
_mergedface(face::Face) = face
_mergedface(face::Symbol) = get(FACES.current[], face, Face())
_mergedface(face::Symbol) = get(Face, FACES.current[], face)
_mergedface(faces::Vector) = mapfoldl(_mergedface, merge, Iterators.reverse(faces))

"""
Expand Down Expand Up @@ -558,7 +558,7 @@ function getface(annotations::Vector{Pair{Symbol, Any}})
end

getface(face::Face) = merge(FACES.current[][:default], merge(Face(), face))
getface(face::Symbol) = getface(get(FACES.current[], face, Face()))
getface(face::Symbol) = getface(get(Face, FACES.current[], face))

"""
getface()
Expand Down