Skip to content

Swap inheritance processing in face merge #22

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
tecosaur merged 1 commit into from
Oct 29, 2023
Merged

Swap inheritance processing in face merge #22

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
20 changes: 10 additions & 10 deletions src/faces.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ Merge the properties of the `initial` face and `others`, with
later faces taking priority.
"""
function merge(a::Face, b::Face)
if isempty(a.inherit)
if isempty(b.inherit)
Face(ifelse(isnothing(b.font), a.font, b.font),
if isnothing(b.height) a.height
elseif isnothing(a.height) b.height
Expand All @@ -468,14 +468,14 @@ function merge(a::Face, b::Face)
ifelse(isnothing(b.underline), a.underline, b.underline),
ifelse(isnothing(b.strikethrough), a.strikethrough, b.strikethrough),
ifelse(isnothing(b.inverse), a.inverse, b.inverse),
b.inherit)
a.inherit)
else
a_noinherit = Face(
a.font, a.height, a.weight, a.slant, a.foreground, a.background,
a.underline, a.strikethrough, a.inverse, Symbol[])
a_inheritance = map(fname -> get(FACES.current[], fname, Face()), Iterators.reverse(a.inherit))
a_resolved = merge(foldl(merge, a_inheritance), a_noinherit)
merge(a_resolved, b)
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_resolved = merge(foldl(merge, b_inheritance), b_noinherit)
merge(a, b_resolved)
end
end

Expand All @@ -496,7 +496,7 @@ function getface(faces)
mergedface(faces::Vector) = mapfoldl(mergedface, merge, Iterators.reverse(faces))
combined = mapfoldl(mergedface, merge, faces)::Face
if !isempty(combined.inherit)
combined = merge(combined, Face())
combined = merge(Face(), combined)
end
merge(FACES.current[][:default], combined)
end
Expand All @@ -511,7 +511,7 @@ function getface(annotations::Vector{Pair{Symbol, Any}})
getface(faces)
end

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

"""
Expand Down