From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 6 Jun 2017 21:55:29 +0000 (+0000)
Subject: Pull-up retrieve_supported_languages private class method (#26055).
X-Git-Tag: 3.4.0~72
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9f5bd0c139f1dd1e4e8734efe3f4611629ddb921;p=redmine.git

Pull-up retrieve_supported_languages private class method (#26055).

Patch by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/trunk@16623 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/lib/redmine/syntax_highlighting.rb b/lib/redmine/syntax_highlighting.rb
index 6d0eab371..580ed6877 100644
--- a/lib/redmine/syntax_highlighting.rb
+++ b/lib/redmine/syntax_highlighting.rb
@@ -55,6 +55,15 @@ 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
+
       class << self
         # Highlights +text+ as the content of +filename+
         # Should not return line numbers nor outer pre tag
@@ -70,10 +79,7 @@ module Redmine
         end
 
         def language_supported?(language)
-          supported_languages =
-            ::CodeRay::Scanners.list +
-            ::CodeRay::Scanners.plugin_hash.keys.map(&:to_sym) -
-            %w(debug default raydebug scanner).map(&:to_sym)
+          supported_languages = retrieve_supported_languages
           supported_languages.include?(language.to_s.downcase.to_sym)
         rescue
           false