summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2017-06-06 21:55:29 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2017-06-06 21:55:29 +0000
commit9f5bd0c139f1dd1e4e8734efe3f4611629ddb921 (patch)
tree81934b09f44adbe7a9229880ac3eb35265888397
parent6198bde3665cbfde664ea9ee3a386eca162b6b3c (diff)
downloadredmine-9f5bd0c139f1dd1e4e8734efe3f4611629ddb921.tar.gz
redmine-9f5bd0c139f1dd1e4e8734efe3f4611629ddb921.zip
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
-rw-r--r--lib/redmine/syntax_highlighting.rb14
1 files changed, 10 insertions, 4 deletions
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