Fix string interpolation into Markdown.Table and Markdown.List #37130
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
KristofferC
reviewed
Aug 20, 2020
fredrikekre
commented
Aug 20, 2020
| @@ -11,7 +11,7 @@ function interpinner(stream::IO, greedy = false) | |||
| startswith(stream, '$') || return | |||
| (eof(stream) || peek(stream, Char) in whitespace) && return | |||
| try | |||
| return _parse(stream::IOBuffer, greedy = greedy) | |||
| return _parse(stream, greedy = greedy) | |||
There was a problem hiding this comment.
This type-assert in try-catch threw sometimes since in some cases this function is passed a GenericIOBuffer instead of an IOBuffer....
There was a problem hiding this comment.
Can you try this? (Requires MethodAnalysis 0.3):
julia> using Markdown, MethodAnalysis
julia> methodinstances(Markdown.interpinner)
2-element Vector{Core.MethodInstance}:
MethodInstance for interpinner(::IOBuffer)
MethodInstance for interpinner(::IOBuffer, ::Bool)Just to make sure it doesn't get inferred with non-concrete IO type. (Maybe do it after running your tests.)
There was a problem hiding this comment.
julia> using Markdown, MethodAnalysis
julia> methodinstances(Markdown.interpinner)
2-element Vector{Core.MethodInstance}:
MethodInstance for interpinner(::IOBuffer)
MethodInstance for interpinner(::IOBuffer, ::Bool)
julia> begin
x = "X"
contains_X(md) = occursin(x, sprint(show, MIME("text/plain"), md))
@assert contains_X(md"# $x") # H1
@assert contains_X(md"## $x") # H2
@assert contains_X(md"### $x") # H3
@assert contains_X(md"x = $x") # Paragraph
@assert contains_X(md"- $x") # List
@assert contains_X(md"[$x](..)") # Link
@assert contains_X(md"**$x**") # Bold
@assert contains_X(md"*$x*") # Italic
@assert contains_X( # Table
md"""
| name |
|------|
| $x |
""")
end
julia> methodinstances(Markdown.interpinner)
4-element Vector{Core.MethodInstance}:
MethodInstance for interpinner(::IOBuffer)
MethodInstance for interpinner(::Base.GenericIOBuffer{SubArray{UInt8,1,Vector{UInt8},Tuple{UnitRange{Int64}},true}})
MethodInstance for interpinner(::IOBuffer, ::Bool)
MethodInstance for interpinner(::Base.GenericIOBuffer{SubArray{UInt8,1,Vector{UInt8},Tuple{UnitRange{Int64}},true}}, ::Bool)in md"..." strings, fixes #16194.
8bd0921 to
2fcb706
Compare
|
Does this by accident also fix #36946? |
|
No. |
timholy
approved these changes
Aug 20, 2020
simeonschaub
pushed a commit
to simeonschaub/julia
that referenced
this pull request
Aug 29, 2020
…..." strings, fixes JuliaLang#16194. (JuliaLang#37130)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix string interpolation into
Markdown.TableandMarkdown.Listinmd"..."strings, fixes #16194.