Skip to content

Asciidoctor: Fix crash on broken definition lists #540

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
Jan 18, 2019
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
5 changes: 4 additions & 1 deletion resources/asciidoctor/lib/scaffold.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ def process document
def process_blocks block
process_block block
for subblock in block.context == :dlist ? block.blocks.flatten : block.blocks
process_blocks subblock
# subblock can be nil for definition lists without a definition.
# this is weird, but it is safe to skip nil here because subclasses
# can't change it anyway.
process_blocks subblock if subblock
end
end
end
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,34 @@
DOCBOOK
expect(actual).to eq(expected.strip)
end

it "doesn't mind missing definitions" do
actual = convert <<~ASCIIDOC
== Example
`thing1`::

def1

`thing2`::
ASCIIDOC
expected = <<~DOCBOOK
<chapter id="_example">
<title>Example</title>
<variablelist>
<varlistentry>
<term><literal>thing1</literal></term>
<listitem>
<simpara>def1</simpara>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>thing2</literal></term>
<listitem>
</listitem>
</varlistentry>
</variablelist>
</chapter>
DOCBOOK
expect(actual).to eq(expected.strip)
end
end