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

Cleanup highlight tag (#9177) 

Merge pull request 9177
This commit is contained in:
Ashwin Maroli 2022-11-07 12:24:19 +05:30 committed by GitHub
parent 4c42559a51
commit f40e5cff5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,16 +82,16 @@ module Jekyll
def render_rouge(code)
require "rouge"
formatter = ::Rouge::Formatters::HTML.new
formatter = Rouge::Formatters::HTML.new
formatter = line_highlighter_formatter(formatter) if @highlight_options[:mark_lines]
formatter = table_formatter(formatter) if @highlight_options[:linenos]
lexer = ::Rouge::Lexer.find_fancy(@lang, code) || Rouge::Lexers::PlainText
lexer = Rouge::Lexer.find_fancy(@lang, code) || Rouge::Lexers::PlainText
formatter.format(lexer.lex(code))
end
def line_highlighter_formatter(formatter)
::Rouge::Formatters::HTMLLineHighlighter.new(
Rouge::Formatters::HTMLLineHighlighter.new(
formatter,
:highlight_lines => mark_lines
)
@ -106,13 +106,11 @@ module Jekyll
end
def table_formatter(formatter)
::Rouge::Formatters::HTMLTable.new(
Rouge::Formatters::HTMLTable.new(
formatter,
{
:css_class => "highlight",
:gutter_class => "gutter",
:code_class => "code",
}
:css_class => "highlight",
:gutter_class => "gutter",
:code_class => "code"
)
end
@ -121,12 +119,8 @@ module Jekyll
end
def add_code_tag(code)
code_attributes = [
"class=\"language-#{@lang.to_s.tr("+", "-")}\"",
"data-lang=\"#{@lang}\"",
].join(" ")
"<figure class=\"highlight\"><pre><code #{code_attributes}>" \
"#{code.chomp}</code></pre></figure>"
code_attrs = %(class="language-#{@lang.tr("+", "-")}" data-lang="#{@lang}")
%(<figure class="highlight"><pre><code #{code_attrs}>#{code.chomp}</code></pre></figure>)
end
end
end