Skip to content
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
11 changes: 10 additions & 1 deletion lib/rdoc/markdown.kpeg
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,15 @@
end
end

##
# Wraps `text` in code markup for rdoc inline formatting

def code text
# escape unescaped backslash at the end
backslash_at_end = "\\" if /(?<!\\)(?:\\\\)*\\\z/.match?(text)
"<code>#{text}#{backslash_at_end}</code>"
end

##
# Parses inline markdown in table cells

Expand Down Expand Up @@ -1129,7 +1138,7 @@ Code = ( Ticks1 @Sp < (
!( @Sp Ticks5 ) ( @Spacechar | @Newline !@BlankLine )
)+ > @Sp Ticks5
)
{ "<code>#{text}</code>" }
{ code text }

RawHtml = < (HtmlComment | HtmlBlockScript | HtmlTag) >
{ if html? then text else '' end }
Expand Down
28 changes: 28 additions & 0 deletions test/rdoc/rdoc_markdown_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,34 @@ def test_parse_code
doc = parse "Code: ``` text`s ```"
expected = doc(para("Code: <code>text`s</code>"))
assert_equal expected, doc

doc = parse "Code: `\\`"
expected = doc(para("Code: <code>\\\\</code>"))
assert_equal expected, doc

doc = parse "Code: ` \\ `"
expected = doc(para("Code: <code>\\\\</code>"))
assert_equal expected, doc

doc = parse "Code: `\\`s`"
expected = doc(para("Code: <code>\\\\</code>s`"))
assert_equal expected, doc

doc = parse "Code: ``\\`s``"
expected = doc(para("Code: <code>\\`s</code>"))
assert_equal expected, doc

doc = parse "Code: `` \\`s ``"
expected = doc(para("Code: <code>\\`s</code>"))
assert_equal expected, doc

doc = parse "Code: ```\\`s```"
expected = doc(para("Code: <code>\\`s</code>"))
assert_equal expected, doc

doc = parse "Code: ``` \\`s ```"
expected = doc(para("Code: <code>\\`s</code>"))
assert_equal expected, doc
end

def test_parse_code_github
Expand Down
Loading