Skip to content

use Tricks.compat_has_method #39

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: master
Choose a base branch
from
+12 −29
Open

use Tricks.compat_has_method #39

Show file tree
Hide file tree
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
4 changes: 1 addition & 3 deletions src/HypertextLiteral.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ See also: [`@htl`](@ref), [`HypertextLiteral.@htl_str`](@ref)
"""
module HypertextLiteral

@static if VERSION >= v"1.3"
using Tricks: static_hasmethod
end
using Tricks: compat_hasmethod

export @htl, @htl_str

Expand Down
37 changes: 11 additions & 26 deletions src/convert.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,36 +86,21 @@ used. Otherwise, the result is printed within a `<span>` tag, using a
serialized as: `<span class="Base-Missing">missing</span>`.
""" content

@static if VERSION >= v"1.3"
function content(x::T) where {T}
if static_hasmethod(show, Tuple{IO, MIME{Symbol("text/html")}, T})
return Render(x)
else
mod = parentmodule(T)
cls = string(nameof(T))
if mod == Core || mod == Base || pathof(mod) !== nothing
cls = join(fullname(mod), "-") * "-" * cls
end
span = """<span class="$cls">"""
return reprint(Bypass(span), x, Bypass("</span>"))
end
end
else
@generated function content(x)
if hasmethod(show, Tuple{IO, MIME{Symbol("text/html")}, x})
return :(Render(x))
else
mod = parentmodule(x)
cls = string(nameof(x))
if mod == Core || mod == Base || pathof(mod) !== nothing
cls = join(fullname(mod), "-") * "-" * cls
end
span = """<span class="$cls">"""
return :(reprint(Bypass($span), x, Bypass("</span>")))
function content(x::T) where {T}
if compat_hasmethod(show, Tuple{IO, MIME{Symbol("text/html")}, T})
return Render(x)
else
mod = parentmodule(T)
cls = string(nameof(T))
if mod == Core || mod == Base || pathof(mod) !== nothing
cls = join(fullname(mod), "-") * "-" * cls
end
span = """<span class="$cls">"""
return reprint(Bypass(span), x, Bypass("</span>"))
end
end


function reprint(xs...)
# generated functions cannot contain a closure
Reprint() do io::IO
Expand Down