Skip to content

fix markdown rendering #37235

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.

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
merged 1 commit into from
Aug 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 7 additions & 9 deletions stdlib/Markdown/src/render/terminal/formatting.jl
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ end
words(s) = split(s, " ")
lines(s) = split(s, "\n")

function wrapped_lines!(lines, io::IO, s::AbstractString, width, i)
function _wrapped_lines(s::AbstractString, width, i)
ws = words(s)
lines = String[]
for word in ws
word_length = ansi_length(word)
if i + word_length + 1 > width
Expand All @@ -25,17 +26,14 @@ function wrapped_lines!(lines, io::IO, s::AbstractString, width, i)
end
end
end
return i
return i, lines
end

function wrapped_lines(io::IO, s::AbstractString; width = 80, i = 0)
lines = AbstractString[]
if occursin(r"\n", s)
for ss in split(s, "\n")
i = wrapped_lines!(lines, io, ss, width, i)
end
else
wrapped_lines!(lines, io, s, width, i)
lines = String[]
for ss in split(s, "\n")
i, line = _wrapped_lines(ss, width, i)
append!(lines, line)
end
return lines
end
Expand Down
8 changes: 8 additions & 0 deletions stdlib/Markdown/test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1158,3 +1158,11 @@ end
| $x |
""")
end

@testset "issue #37232: linebreaks" begin
s = @md_str """
Misc:\\
- line\\
"""
@test sprint(show, MIME("text/plain"), s) == " Misc:\n - line\n "
end