Project

General

Profile

Defect #31285 » fix-syntax-highlighting-for-pl-attachments.diff

patch - Go MAEDA, 2019-05-01 10:06

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
    code_perl, code_prolog = <<'PERL', <<'PROLOG'
25
#!/usr/bin/perl
26
print "Hello, world!\n";
27
PERL
28
#!/usr/bin/swipl
29
:- writeln('Hello, world!'),halt.
30
PROLOG
31
    filename = 'hello.pl'
32

  
33
    assert_equal Rouge::Lexers::Perl, Rouge::Lexer.guess(:filename => filename, :source => code_perl)
34
    assert_equal Rouge::Lexers::Prolog, Rouge::Lexer.guess(:filename => filename, :source => code_prolog)
35

  
36
    # Rouge raises Rouge::Guesser::Ambiguous exception if it cannot decide
37
    # between prolog and perl
38
    assert_nothing_raised do
39
      html = Redmine::SyntaxHighlighting::Rouge.highlight_by_filename(code_perl, filename)
40
      assert_match '<span class=', html
41
      html = Redmine::SyntaxHighlighting::Rouge.highlight_by_filename(code_prolog, filename)
42
      assert_match '<span class=', html
43
    end
44
  end
45
end
(3-3/4)