dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3401 from jekyll/fix-code-cleanup

This commit is contained in:
Parker Moore 2015-02-09 16:26:19 -08:00
parent 72e297366d 32c48bb78d
commit c625b94bc0
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/jekyll/tags/highlight.rb
View File

@ -42,7 +42,7 @@ eos
def render(context) def render(context)
prefix = context["highlighter_prefix"] || "" prefix = context["highlighter_prefix"] || ""
suffix = context["highlighter_suffix"] || "" suffix = context["highlighter_suffix"] || ""
code = super.to_s.gsub(/^(\n|\r)+|(\n|\r)+$/, '') code = super.to_s.gsub(/\A(\n|\r)+|(\n|\r)+\z/, '')
is_safe = !!context.registers[:site].safe is_safe = !!context.registers[:site].safe

20
test/test_tags.rb
View File

@ -190,6 +190,26 @@ EOS
end end
end end
context "post content has highlight tag with preceding spaces & lines in several places" do
setup do
fill_post <<-EOS
[,1] [,2]
[1,] FALSE TRUE
[2,] FALSE TRUE
EOS
end
should "only strip the newlines which precede and succeed the entire block" do
assert_match "<pre><code class=\"language-text\" data-lang=\"text\"> [,1] [,2]\n\n\n[1,] FALSE TRUE\n[2,] FALSE TRUE</code></pre>", @result
end
end
context "post content has highlight tag with preceding spaces & Windows-style newlines" do context "post content has highlight tag with preceding spaces & Windows-style newlines" do
setup do setup do
fill_post "\r\n\r\n\r\n [,1] [,2]" fill_post "\r\n\r\n\r\n [,1] [,2]"