Project

General

Profile

Defect #31285 » 0001-Fix-that-Redmine-SyntaxHighlighting.highlight_by_fil.patch

Go MAEDA, 2019-05-02 08:12

View differences:

lib/redmine/syntax_highlighting.rb
85 85
          # See also: https://github.com/jneen/rouge/pull/1078
86 86
          text = text.gsub(/\r\n?/, "\n")
87 87

  
88
          lexer =::Rouge::Lexer.guess_by_filename(filename)
88
          lexer =::Rouge::Lexer.guess(:source => text, :filename => filename)
89 89
          formatter = ::Rouge::Formatters::HTML.new
90 90
          ::Rouge.highlight(text, lexer, CustomHTMLLinewise.new(formatter))
91 91
        end
test/unit/lib/redmine/syntax_highlighting/rouge_test.rb
1
# frozen_string_literal: true
2

  
3
# Redmine - project management software
4
# Copyright (C) 2006-2017  Jean-Philippe Lang
5
#
6
# This program is free software; you can redistribute it and/or
7
# modify it under the terms of the GNU General Public License
8
# as published by the Free Software Foundation; either version 2
9
# of the License, or (at your option) any later version.
10
#
11
# This program is distributed in the hope that it will be useful,
12
# but WITHOUT ANY WARRANTY; without even the implied warranty of
13
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
# GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License
17
# along with this program; if not, write to the Free Software
18
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
19

  
20
require File.expand_path('../../../../../test_helper', __FILE__)
21

  
22
class Redmine::SyntaxHighlighting::RougeTest < ActiveSupport::TestCase
23
  def test_highlight_by_filename_should_distinguish_perl_and_prolog
24
    raw_perl = <<'RAW_PERL'
25
#!/usr/bin/perl
26
print "Hello, world!\n";
27
RAW_PERL
28
    expected_perl = <<'EXPECTED_PERL'
29
<span class="c1">#!/usr/bin/perl</span>
30
<span class="k">print</span> <span class="s">"Hello, world!\n"</span><span class="p">;</span>
31
EXPECTED_PERL
32
    raw_prolog = <<'RAW_PROLOG'
33
#!/usr/bin/swipl
34
:- writeln('Hello, world!'),halt.
35
RAW_PROLOG
36
    expected_prolog = <<'EXPECTED_PROLOG'
37
<span class="c1">#!/usr/bin/swipl</span>
38
<span class="p">:-</span> <span class="ss">writeln</span><span class="p">(</span><span class="ss">'Hello, world!'</span><span class="p">),</span><span class="ss">halt</span><span class="p">.</span>
39
EXPECTED_PROLOG
40

  
41
    filename = 'hello.pl'
42

  
43
    # Rouge cannot distinguish between Perl and Prolog by filename alone
44
    assert_raises Rouge::Guesser::Ambiguous do
45
      Rouge::Lexer.guess(:filename => filename)
46
    end
47
    assert_equal Rouge::Lexers::Perl, Rouge::Lexer.guess(:filename => filename, :source => raw_perl)
48
    assert_equal Rouge::Lexers::Prolog, Rouge::Lexer.guess(:filename => filename, :source => raw_prolog)
49

  
50
    assert_equal expected_perl, Redmine::SyntaxHighlighting::Rouge.highlight_by_filename(raw_perl, filename)
51
    assert_equal expected_prolog, Redmine::SyntaxHighlighting::Rouge.highlight_by_filename(raw_prolog, filename)
52
  end
53
end
(4-4/4)