kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

[ruby/rdoc] Allow trailing pipes to be ommitted

Browse source 
https://github.com/ruby/rdoc/commit/1318048877
This commit is contained in:
Nobuyoshi Nakada 2022-10-06 13:10:31 +09:00
parent 76bae60d9b
commit a19bf47d03
2 changed files with 33 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/rdoc/markdown.rb
View file

@ -15966,7 +15966,7 @@ class RDoc::Markdown
return _tmp
end
# TableRow = TableItem+:row "|" @Newline { row }
# TableRow = TableItem+:row "|"? @Newline { row }
def _TableRow
_save = self.pos
@ -15991,7 +15991,12 @@ class RDoc::Markdown
self.pos = _save
break
end
_save2 = self.pos
_tmp = match_string("|")
unless _tmp
_tmp = true
self.pos = _save2
end
unless _tmp
self.pos = _save
break
@ -16104,7 +16109,7 @@ class RDoc::Markdown
return _tmp
end
# TableLine = TableColumn+:line "|" @Newline { line }
# TableLine = TableColumn+:line "|"? @Newline { line }
def _TableLine
_save = self.pos
@ -16129,7 +16134,12 @@ class RDoc::Markdown
self.pos = _save
break
end
_save2 = self.pos
_tmp = match_string("|")
unless _tmp
_tmp = true
self.pos = _save2
end
unless _tmp
self.pos = _save
break
@ -16675,9 +16685,9 @@ class RDoc::Markdown
Rules[:_RawNoteBlock] = rule_info("RawNoteBlock", "@StartList:a (!@BlankLine !RawNoteReference OptionallyIndentedLine:l { a << l })+ < @BlankLine* > { a << text } { a }")
Rules[:_CodeFence] = rule_info("CodeFence", "&{ github? } Ticks3 (@Sp StrChunk:format)? Spnl < ((!\"`\" Nonspacechar)+ | !Ticks3 /`+/ | Spacechar | @Newline)+ > Ticks3 @Sp @Newline* { verbatim = RDoc::Markup::Verbatim.new text verbatim.format = format.intern if format.instance_of?(String) verbatim }")
Rules[:_Table] = rule_info("Table", "&{ github? } TableRow:header TableLine:line TableRow+:body { table = RDoc::Markup::Table.new(header, line, body) }")
Rules[:_TableRow] = rule_info("TableRow", "TableItem+:row \"|\" @Newline { row }")
Rules[:_TableRow] = rule_info("TableRow", "TableItem+:row \"|\"? @Newline { row }")
Rules[:_TableItem] = rule_info("TableItem", "\"|\" < (!\"|\" !@Newline .)+ > { text.strip }")
Rules[:_TableLine] = rule_info("TableLine", "TableColumn+:line \"|\" @Newline { line }")
Rules[:_TableLine] = rule_info("TableLine", "TableColumn+:line \"|\"? @Newline { line }")
Rules[:_TableColumn] = rule_info("TableColumn", "\"|\" < (\"-\"+ \":\"? | \":\" \"-\"*) > { text.start_with?(\":\") ? :left : text.end_with?(\":\") ? :right : nil }")
Rules[:_DefinitionList] = rule_info("DefinitionList", "&{ definition_lists? } DefinitionListItem+:list { RDoc::Markup::List.new :NOTE, *list.flatten }")
Rules[:_DefinitionListItem] = rule_info("DefinitionListItem", "DefinitionListLabel+:label DefinitionListDefinition+:defns { list_items = [] list_items << RDoc::Markup::ListItem.new(label, defns.shift) list_items.concat defns.map { |defn| RDoc::Markup::ListItem.new nil, defn } unless list_items.empty? list_items }")

19
test/rdoc/test_rdoc_markdown.rb
View file

@ -1062,6 +1062,25 @@ and an extra note.[^2]
assert_equal expected, doc
end
def test_gfm_table_2
doc = parse <<~MD
| Cmd | Returns | Meaning
|-----|---------|--------
| "b" | boolean | True if file1 is a block device
| "c" | boolean | True if file1 is a character device
MD
head = %w[Cmd Returns Meaning]
align = [nil, nil, nil]
body = [
['"b"', 'boolean', 'True if file1 is a block device'],
['"c"', 'boolean', 'True if file1 is a character device'],
]
expected = doc(@RM::Table.new(head, align, body))
assert_equal expected, doc
end
def parse text
@parser.parse text
end