From 0e8008ad88b4f56e35d71c3029d02ffb4e21120f Mon Sep 17 00:00:00 2001 From: Etienne Massip Date: Thu, 26 Jan 2012 21:14:59 +0100 Subject: Extracted code making HTML lines independent from numbering code to a specific option in encoder. --- lib/coderay/encoders/html.rb | 27 +++++++++++++++++++++++---- lib/coderay/encoders/html/numbering.rb | 16 ++-------------- 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/lib/coderay/encoders/html.rb b/lib/coderay/encoders/html.rb index c32dbd1..14d1307 100644 --- a/lib/coderay/encoders/html.rb +++ b/lib/coderay/encoders/html.rb @@ -47,6 +47,12 @@ module Encoders # # Default: 'CodeRay output' # + # === :independent_lines + # Split multilines blocks into line-wide blocks. + # Forced to true if :line_numbers option is set to :inline. + # + # Default: false + # # === :line_numbers # Include line numbers in :table, :inline, or nil (no line numbers) # @@ -99,7 +105,8 @@ module Encoders :style => :alpha, :wrap => nil, :title => 'CodeRay output', - + + :independent_lines => false, :line_numbers => nil, :line_number_anchors => 'n', :line_number_start => 1, @@ -167,7 +174,11 @@ module Encoders @real_out = @out @out = '' end - + + options[:independent_lines] = true if options[:line_numbers] == :inline + + @independent_lines = (options[:independent_lines] == true) + @HTML_ESCAPE = HTML_ESCAPE.dup @HTML_ESCAPE["\t"] = ' ' * options[:tab_width] @@ -245,13 +256,21 @@ module Encoders if text =~ /#{HTML_ESCAPE_PATTERN}/o text = text.gsub(/#{HTML_ESCAPE_PATTERN}/o) { |m| @HTML_ESCAPE[m] } end + if @independent_lines && @opened.any? && text.end_with?("\n") + text.chomp! + close_eol_reopen = "#{'' * @opened.size}\n" + @opened.each_with_index do |k, index| + close_eol_reopen << (@span_for_kind[index > 0 ? [k, *@opened[0 ... index ]] : k] || '') + end + end if style = @span_for_kind[@last_opened ? [kind, *@opened] : kind] @out << style << text << '' else @out << text end + @out << close_eol_reopen if close_eol_reopen end - + # token groups, eg. strings def begin_group kind @out << (@span_for_kind[@last_opened ? [kind, *@opened] : kind] || '') @@ -299,4 +318,4 @@ module Encoders end end -end +end \ No newline at end of file diff --git a/lib/coderay/encoders/html/numbering.rb b/lib/coderay/encoders/html/numbering.rb index 15ce11b..904a64f 100644 --- a/lib/coderay/encoders/html/numbering.rb +++ b/lib/coderay/encoders/html/numbering.rb @@ -68,23 +68,11 @@ module Encoders when :inline max_width = (start + line_count).to_s.size line_number = start - nesting = [] output.gsub!(/^.*$\n?/) do |line| - line.chomp! - open = nesting.join - line.scan(%r!<(/)?span[^>]*>?!) do |close,| - if close - nesting.pop - else - nesting << $& - end - end - close = '' * nesting.size - line_number_text = bolding.call line_number indent = ' ' * (max_width - line_number.to_s.size) # TODO: Optimize (10^x) line_number += 1 - "#{indent}#{line_number_text}#{open}#{line}#{close}\n" + "#{indent}#{line_number_text}#{line}" end when :table @@ -112,4 +100,4 @@ module Encoders end end -end +end \ No newline at end of file -- cgit v1.2.1 From a2e9acc4dabd2ec2d33ac17d83f92ef370354eb7 Mon Sep 17 00:00:00 2001 From: Etienne Massip Date: Thu, 29 Mar 2012 20:46:07 +0200 Subject: Fixed handling of eols inside token content. --- lib/coderay/encoders/html.rb | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/coderay/encoders/html.rb b/lib/coderay/encoders/html.rb index 14d1307..0d91cdf 100644 --- a/lib/coderay/encoders/html.rb +++ b/lib/coderay/encoders/html.rb @@ -256,19 +256,23 @@ module Encoders if text =~ /#{HTML_ESCAPE_PATTERN}/o text = text.gsub(/#{HTML_ESCAPE_PATTERN}/o) { |m| @HTML_ESCAPE[m] } end - if @independent_lines && @opened.any? && text.end_with?("\n") - text.chomp! - close_eol_reopen = "#{'' * @opened.size}\n" + + style = @span_for_kind[@last_opened ? [kind, *@opened] : kind] + + if @independent_lines && (i = text.index("\n")) && (c = @opened.size + (style ? 1 : 0)) > 0 + close = '' * c + reopen = '' @opened.each_with_index do |k, index| - close_eol_reopen << (@span_for_kind[index > 0 ? [k, *@opened[0 ... index ]] : k] || '') + reopen << (@span_for_kind[index > 0 ? [k, *@opened[0 ... index ]] : k] || '') end + text[i .. -1] = text[i .. -1].gsub("\n", "#{close}\n#{reopen}#{style}") end - if style = @span_for_kind[@last_opened ? [kind, *@opened] : kind] + + if style @out << style << text << '' else @out << text end - @out << close_eol_reopen if close_eol_reopen end # token groups, eg. strings -- cgit v1.2.1 From ce3a6c7bcc0b7efac4844de859d8c8364476ab0d Mon Sep 17 00:00:00 2001 From: Etienne Massip Date: Thu, 29 Mar 2012 20:47:18 +0200 Subject: Added a unit test for HTML encoder (with a test for :line_independent option) --- test/unit/html.rb | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 test/unit/html.rb diff --git a/test/unit/html.rb b/test/unit/html.rb new file mode 100644 index 0000000..f6e3d7e --- /dev/null +++ b/test/unit/html.rb @@ -0,0 +1,104 @@ +require 'test/unit' +require 'coderay' + +class HtmlTest < Test::Unit::TestCase + + def test_independent_lines_option + + snippets = {} + + snippets[:ruby] = {} + + snippets[:ruby][:in] = <<-RUBY +ruby_inside = <<-RUBY_INSIDE +This is tricky, +isn't it? +RUBY_INSIDE + RUBY + + snippets[:ruby][:expected_with_option_off] = <<-HTML_OPT_INDEPENDENT_LINES_OFF +ruby_inside = <<-RUBY_INSIDE +This is tricky, +isn't it? +RUBY_INSIDE + HTML_OPT_INDEPENDENT_LINES_OFF + + snippets[:ruby][:expected_with_option_on] = <<-HTML_OPT_INDEPENDENT_LINES_ON +ruby_inside = <<-RUBY_INSIDE +This is tricky, +isn't it? +RUBY_INSIDE + HTML_OPT_INDEPENDENT_LINES_ON + + snippets[:java] = {} + + snippets[:java][:in] = <<-JAVA +import java.lang.*; + +/** + * This is some multiline javadoc + * used to test the + */ +public class Test { + public static final String MESSAGE = "My message\ + To the world"; + + static void main() { + /* + * Another multiline + * comment + */ + System.out.println(MESSAGE); + } +} + JAVA + + snippets[:java][:expected_with_option_off] = <<-HTML_OPT_INDEPENDENT_LINES_OFF +import java.lang.*; + +/** + * This is some multiline javadoc + * used to test the + */ +public class Test { + public static final String MESSAGE = "My message To the world"; + + static void main() { + /* + * Another multiline + * comment + */ + System.out.println(MESSAGE); + } +} + HTML_OPT_INDEPENDENT_LINES_OFF + + snippets[:java][:expected_with_option_on] = <<-HTML_OPT_INDEPENDENT_LINES_ON +import java.lang.*; + +/** + * This is some multiline javadoc + * used to test the + */ +public class Test { + public static final String MESSAGE = "My message To the world"; + + static void main() { + /* + * Another multiline + * comment + */ + System.out.println(MESSAGE); + } +} + HTML_OPT_INDEPENDENT_LINES_ON + + snippets.entries().each do |lang, code| + tokens = CodeRay.scan code[:in], lang + + assert_equal code[:expected_with_option_off], tokens.html + assert_equal code[:expected_with_option_off], tokens.html(:independent_lines => false) + assert_equal code[:expected_with_option_on], tokens.html(:independent_lines => true) + end + end +end \ No newline at end of file -- cgit v1.2.1