From 9293ecc174c9466329753b63c1e292dd14055dea Mon Sep 17 00:00:00 2001 From: sjml Date: Wed, 30 Jan 2013 01:53:04 -0500 Subject: [PATCH 1/2] Update plugins/pygments_code.rb Making it so the build doesn't fail if a bad lexer is passed to the code highlighting. --- plugins/pygments_code.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/pygments_code.rb b/plugins/pygments_code.rb index 1676a3e..debeae1 100644 --- a/plugins/pygments_code.rb +++ b/plugins/pygments_code.rb @@ -21,7 +21,11 @@ module HighlightCode if File.exist?(path) highlighted_code = File.read(path) else - highlighted_code = Pygments.highlight(code, :lexer => lang, :formatter => 'html', :options => {:encoding => 'utf-8'}) + begin + highlighted_code = Pygments.highlight(code, :lexer => lang, :formatter => 'html', :options => {:encoding => 'utf-8'}) + rescue Exception => e + highlighted_code = Pygments.highlight(code, :lexer => 'text', :formatter => 'html', :options => {:encoding => 'utf-8'}) + end File.open(path, 'w') {|f| f.print(highlighted_code) } end else From 35e23f59ca00a04c1784180b765c3e6cc23f9a40 Mon Sep 17 00:00:00 2001 From: Shane Liesegang Date: Wed, 30 Jan 2013 21:51:26 -0500 Subject: [PATCH 2/2] Update plugins/pygments_code.rb Giving a more helpful error message instead of silently failing. --- plugins/pygments_code.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/pygments_code.rb b/plugins/pygments_code.rb index debeae1..87d3cd6 100644 --- a/plugins/pygments_code.rb +++ b/plugins/pygments_code.rb @@ -23,8 +23,8 @@ module HighlightCode else begin highlighted_code = Pygments.highlight(code, :lexer => lang, :formatter => 'html', :options => {:encoding => 'utf-8'}) - rescue Exception => e - highlighted_code = Pygments.highlight(code, :lexer => 'text', :formatter => 'html', :options => {:encoding => 'utf-8'}) + rescue MentosError + raise "Pygments can't parse unknown language: #{lang}." end File.open(path, 'w') {|f| f.print(highlighted_code) } end