Add syntax highlighting for markdown content

3 files changed, 21 insertions, 1 deletions

diff --git a/app/assets/javascripts/app/helpers/text_formatter.js b/app/assets/javascripts/app/helpers/text_formatter.js
index 5bdfd5830..163f938ed 100644
--- a/app/assets/javascripts/app/helpers/text_formatter.js
+++ b/app/assets/javascripts/app/helpers/text_formatter.js
@@ -8,7 +8,8 @@
       breaks:      true,
       html:        true,
       linkify:     true,
-      typographer: true
+      typographer: true,
+      langPrefix:  ""
     });
 
     var inlinePlugin = window.markdownitForInline;
@@ -50,6 +51,23 @@
     var sanitizerPlugin = window.markdownitSanitizer;
     md.use(sanitizerPlugin);
 
+    var hljs = window.hljs;
+    md.set({
+      highlight: function(str, lang) {
+        if (lang && hljs.getLanguage(lang)) {
+          try {
+            return hljs.highlight(lang, str).value;
+          } catch (__) {}
+        }
+
+        try {
+          return hljs.highlightAuto(str).value;
+        } catch (__) {}
+
+        return "";
+      }
+    });
+
     // xmpp: should behave like mailto:
     md.linkify.add("xmpp:","mailto:");
     // mumble:// should behave like http://:
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index 452235f9b..7114600e6 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -35,6 +35,7 @@
 //= require markdown-it-sanitizer
 //= require markdown-it-sub
 //= require markdown-it-sup
+//= require highlightjs
 //= require clear-form
 //= require app/app
 //= require diaspora
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 4d3bd3df3..a4f8ce423 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -92,6 +92,7 @@
 
 /* code */
 @import 'new_styles/code';
+@import 'highlightjs/github';
 
 /* statistics */
 @import 'new_styles/statistics';