Merge pull request #4260 from dosire/pygments-name

Fix pygment lexer 500 errors when an alias is used instead of a name.

Merge pull request #4260 from dosire/pygments-name
Fix pygment lexer 500 errors when an alias is used instead of a name.
Dmitriy Zaporozhets
2 parents 05bc6589 409b0a0a
Showing 1 changed file with 2 additions and 1 deletions Show diff stats
lib/redcarpet/render/gitlab_html.rb
@@ -11,7 +11,8 @@ class Redcarpet::Render::GitlabHTML &lt; Redcarpet::Render::HTML
  
   def block_code(code, language)
     options = { options: {encoding: 'utf-8'} }
-    options.merge!(lexer: language.downcase) if Pygments::Lexer.find(language)
+    lexer = Pygments::Lexer.find(language) # language can be an alias
+    options.merge!(lexer: lexer.name.downcase) if lexer # downcase is required
  
     # New lines are placed to fix an rendering issue
     # with code wrapped inside <h1> tag for next case:
...	...	@@ -11,7 +11,8 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML
11	11
12	12	def block_code(code, language)
13	13	options = { options: {encoding: 'utf-8'} }
14		- options.merge!(lexer: language.downcase) if Pygments::Lexer.find(language)
	14	+ lexer = Pygments::Lexer.find(language) # language can be an alias
	15	+ options.merge!(lexer: lexer.name.downcase) if lexer # downcase is required
15	16
16	17	# New lines are placed to fix an rendering issue
17	18	# with code wrapped inside <h1> tag for next case:
...	...