Skip to content

Replace use of noshift constructor with new unannotate #125

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 1 commit into
base: main
Choose a base branch
from
Open

Replace use of noshift constructor with new unannotate #125

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
14 changes: 12 additions & 2 deletions src/io.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,17 @@ function termstyle(io::IO, face::Face, lastface::Face=getface())
ANSI_STYLE_CODES.end_reverse))
end

@static if isdefined(Base, :unannotate)
# This function uses SubString and AnnotatedString internals, but for current
# and future versions, Base.unannotate is defined, and so this cannot break
# in the future.
const unannotate = Base.unannotate
else
function unannotate(s::SubString{AnnotatedString{S}}) where S
SubString{S}(s.string.string, s.offset, s.ncodeunits, Val(:noshift))
end
end

function _ansi_writer(string_writer::F, io::IO, s::Union{<:AnnotatedString, SubString{<:AnnotatedString}}) where {F <: Function}
# We need to make sure that the customisations are loaded
# before we start outputting any styled content.
Expand All @@ -253,8 +264,7 @@ function _ansi_writer(string_writer::F, io::IO, s::Union{<:AnnotatedString, SubS
elseif s isa AnnotatedString
string_writer(io, s.string)
elseif s isa SubString
string_writer(
io, SubString(s.string.string, s.offset, s.ncodeunits, Val(:noshift)))
string_writer(io, unannotate(s))
end
end

Expand Down
Loading