Skip to content

Switch noshift substring constructor to new unannotate function #13

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

Switch noshift substring constructor to new unannotate function #13

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
13 changes: 12 additions & 1 deletion src/JuliaSyntaxHighlighting.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,8 +460,19 @@ function highlight!(str::AnnotatedString; syntax_errors::Bool = false)
str
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 highlight!(str::SubString{AnnotatedString{S}}; syntax_errors::Bool = false) where {S}
plainstr = SubString{S}(str.string.string, str.offset, str.ncodeunits, Val(:noshift))
plainstr = unannotate(str)
for ann in _hl_annotations(plainstr, parseall(GreenNode, plainstr, ignore_errors=true); syntax_errors)
annotate!(str, ann.region, ann.label, ann.value)
end
Expand Down
Loading