From 49108983cb69f00e7adf1544284bd03a1d97e575 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Wed, 7 Jun 2017 19:35:27 +0000 Subject: Merged r16622 to r16625 (#26055). git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16630 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/syntax_highlighting.rb | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/redmine/syntax_highlighting.rb b/lib/redmine/syntax_highlighting.rb index 4380627ac..feff4f6b7 100644 --- a/lib/redmine/syntax_highlighting.rb +++ b/lib/redmine/syntax_highlighting.rb @@ -55,6 +55,17 @@ module Redmine module CodeRay require 'coderay' + def self.retrieve_supported_languages + ::CodeRay::Scanners.list + + # Add CodeRay scanner aliases + ::CodeRay::Scanners.plugin_hash.keys.map(&:to_sym) - + # Remove internal CodeRay scanners + %w(debug default raydebug scanner).map(&:to_sym) + end + private_class_method :retrieve_supported_languages + + SUPPORTED_LANGUAGES = retrieve_supported_languages + class << self # Highlights +text+ as the content of +filename+ # Should not return line numbers nor outer pre tag @@ -70,10 +81,7 @@ module Redmine end def language_supported?(language) - supported_languages = - ::CodeRay::Scanners.list + - ::CodeRay::Scanners.plugin_hash.keys.map(&:to_sym) - supported_languages.include?(language.to_s.downcase.to_sym) + SUPPORTED_LANGUAGES.include?(language.to_s.downcase.to_sym) rescue false end -- cgit v1.2.3