wiki.ohea.xyz/gollum
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Code hilighter needs to handle blanks lines.

Browse Source
This commit is contained in:
Tom Preston-Werner
2010-07-29 21:57:30 -04:00
parent f23d093d6f
commit 38b8700651
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/gollum/markup.rb
+1 -1
View File
@@ -321,7 +321,7 @@ module Gollum
@codemap.each do |id, spec|
lang = spec[:lang]
code = spec[:code]
if code.all? { |line| line =~ /^( |\t)/ }
if code.all? { |line| line =~ /\A\r?\n\Z/ || line =~ /^( |\t)/ }
code.gsub!(/^( |\t)/m, '')
end
data.gsub!(id, Gollum::Albino.new(code, lang).colorize)
test/test_markup.rb
+10 -8
View File
@@ -271,18 +271,20 @@ context "Markup" do
end
test "code blocks with two-space indent" do
content = "a\n\n```ruby\n x = 1\n```\n\nb"
output = "<p>a</p>\n\n<div class=\"highlight\"><pre>" +
"<span class=\"n\">x</span> <span class=\"o\">=</span> " +
"<span class=\"mi\">1</span>\n</pre>\n</div>\n\n<p>b</p>"
content = "a\n\n```ruby\n x = 1\n\n y = 2\n```\n\nb"
output = "<p>a</p>\n\n<div class=\"highlight\"><pre><span class=\"n\">" +
"x</span> <span class=\"o\">=</span> <span class=\"mi\">1" +
"</span>\n\n<span class=\"n\">y</span> <span class=\"o\">=" +
"</span> <span class=\"mi\">2</span>\n</pre>\n</div>\n\n<p>b</p>"
compare(content, output)
end
test "code blocks with one-tab indent" do
content = "a\n\n```ruby\n\tx = 1\n```\n\nb"
output = "<p>a</p>\n\n<div class=\"highlight\"><pre>" +
"<span class=\"n\">x</span> <span class=\"o\">=</span> " +
"<span class=\"mi\">1</span>\n</pre>\n</div>\n\n<p>b</p>"
content = "a\n\n```ruby\n\tx = 1\n\n\ty = 2\n```\n\nb"
output = "<p>a</p>\n\n<div class=\"highlight\"><pre><span class=\"n\">" +
"x</span> <span class=\"o\">=</span> <span class=\"mi\">1" +
"</span>\n\n<span class=\"n\">y</span> <span class=\"o\">=" +
"</span> <span class=\"mi\">2</span>\n</pre>\n</div>\n\n<p>b</p>"
compare(content, output)
end