From 93330c5be3cfdf4287d6306d2aa2340299fd06b9 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Tue, 5 Jul 2011 15:50:33 -0500 Subject: [PATCH] Preserve new lines for syntax highlighting --- lib/linguist/lexer.rb | 2 +- test/test_language.rb | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/linguist/lexer.rb b/lib/linguist/lexer.rb index 0bafd280..f38d730b 100644 --- a/lib/linguist/lexer.rb +++ b/lib/linguist/lexer.rb @@ -141,7 +141,7 @@ module Linguist # # Returns html String def colorize(text) - Albino.colorize(text, self) + Albino.new(text, self).colorize(:O => 'stripnl=false') end # Public: Highlight syntax of text without the outer highlight div diff --git a/test/test_language.rb b/test/test_language.rb index ffea3054..5b524021 100644 --- a/test/test_language.rb +++ b/test/test_language.rb @@ -457,6 +457,16 @@ Hello assert_equal <<-HTML, Language['Ruby'].colorize_without_wrapper("def foo\n 'foo'\nend\n") def foo 'foo' +end + HTML + end + + def test_colorize_doesnt_strip_newlines + assert_equal <<-HTML, Language['Ruby'].colorize_without_wrapper("\n\n# Foo\ndef 'foo'\nend\n") + + +# Foo +def 'foo' end HTML end