Merge branch 'pre-class' of https://github.com/devbaraus/showdown-highlight into new-version

Author: IonicaBizau

lib/index.d.ts

@@ -1,4 +1,6 @@
-import type { ShowdownExtension } from 'showdown';
+import type { ShowdownExtension } from "showdown";
 
-declare function showdownHighlight(): ShowdownExtension[];
+declare function showdownHighlight({
+  pre: Boolean = false,
+}): ShowdownExtension[];
 export = showdownHighlight;

lib/index.js

@@ -1,40 +1,44 @@
 "use strict";
 
 const decodeHtml = require("html-encoder-decoder").decode
-    , showdown = require("showdown")
-    , hljs = require("highlight.js")
-    , classAttr = 'class="'
-    ;
+  , showdown = require("showdown")
+  , hljs = require("highlight.js")
+  , classAttr = 'class="'
+  ;
 
-module.exports = function showdownHighlight () {
-    return [
-        {
-            type: "output"
-          , filter (text, converter, options) {
-                let left  = "<pre><code\\b[^>]*>"
-                  , right = "</code></pre>"
-                  , flags = "g"
-                  , replacement = (wholeMatch, match, left, right) => {
-                        match = decodeHtml(match);
-                        let lang = (left.match(/class=\"([^ \"]+)/) || [])[1];
+module.exports = function showdownHighlight({ pre = false }) {
+  return [
+    {
+      type: "output"
+      , filter(text, converter, options) {
+        let left = "<pre><code\\b[^>]*>"
+          , right = "</code></pre>"
+          , flags = "g"
+          , replacement = (wholeMatch, match, left, right) => {
+            match = decodeHtml(match);
+            let lang = (left.match(/class=\"([^ \"]+)/) || [])[1];
 
-                        if (left.includes(classAttr)) {
-                          let attrIndex = left.indexOf(classAttr) + classAttr.length;
-                          left = left.slice(0, attrIndex) + 'hljs ' + left.slice(attrIndex);
-                        } else {
-                          left = left.slice(0, -1) + ' class="hljs">';
-                        }
-                        
-                        if (lang && hljs.getLanguage(lang)) {
-                            return left + hljs.highlight(lang, match).value + right;
-                        } else {
-                            return left + hljs.highlightAuto(match).value + right;
-                        }
-                    }
-                  ;
+            if (left.includes(classAttr)) {
+              let attrIndex = left.indexOf(classAttr) + classAttr.length;
+              left = left.slice(0, attrIndex) + 'hljs ' + left.slice(attrIndex);
+            } else {
+              left = left.slice(0, -1) + ' class="hljs">';
+            }
+
+            if (pre && lang) {
+              left = left.replace('<pre>', `<pre class="${lang} language-${lang}">`);
+            }
 
-                return showdown.helper.replaceRecursiveRegExp(text, replacement, left, right, flags);
+            if (lang && hljs.getLanguage(lang)) {
+              return left + hljs.highlight(lang, match).value + right;
+            } else {
+              return left + hljs.highlightAuto(match).value + right;
             }
-        }
-    ];
+          }
+          ;
+
+        return showdown.helper.replaceRecursiveRegExp(text, replacement, left, right, flags);
+      }
+    }
+  ];
 };

package.json

@@ -52,6 +52,7 @@
   "contributors": [
     "Cristiano Ribeiro <expedit@gmail.com> (https://github.com/expedit85)",
     "obedm503 (https://obedm503.github.io)",
-    "Ariel Shaqed (Scolnicov) (https://github.com/arielshaqed)"
+    "Ariel Shaqed (Scolnicov) (https://github.com/arielshaqed)",
+    "Bruno de Araújo Alves (devbaraus) (https://github.com/devbaraus)"
   ]
 }