summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/gitlab/highlight.rb9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/gitlab/highlight.rb b/lib/gitlab/highlight.rb
index 41296415e35..adac216b337 100644
--- a/lib/gitlab/highlight.rb
+++ b/lib/gitlab/highlight.rb
@@ -28,11 +28,14 @@ module Gitlab
end
def highlight(text, continue: true, plain: false)
+ lexer = @lexer
+
if plain
- @formatter.format(Rouge::Lexers::PlainText.lex(text)).html_safe
- else
- @formatter.format(@lexer.lex(text, continue: continue)).html_safe
+ lexer = Rouge::Lexers::PlainText
+ continue = false
end
+
+ @formatter.format(@lexer.lex(text, continue: continue)).html_safe
rescue
@formatter.format(Rouge::Lexers::PlainText.lex(text)).html_safe
end