Merge branch 'fix-11' of https://github.com/obedm503/showdown-highlight into new-version

Author: IonicaBizau

README.md

@@ -81,8 +81,11 @@ If you are using this library in one of your projects, add it in this list. :spa
 
 
  - [`bloggify-markdown-highlight`](https://github.com/Bloggify/bloggify-markdown-highlight#readme) (by Bloggify)—Highlight code blocks in the Markdown code.
+ - [`ember-showdown-highlight`](https://npmjs.com/package/ember-showdown-highlight)—The default blueprint for ember-cli addons.
  - [`markdown2dash`](https://github.com/eyworldwide/markdown2dash#readme) (by Bob)—Convert markdown files to Dash docset in CLI
+ - [`md-srv`](https://npmjs.com/package/md-srv) (by aikei)—a simple server, converting served .md files to html
  - [`swanky`](https://github.com/swanky-docs/swanky#readme) (by Rod Leviton)—A simple, flexible and powerful tool for creating beautiful documentation.
+ - [`trumpdoc`](https://npmjs.com/package/trumpdoc)—# Features - 😄 Suuuupppper easy to build. Do not need any shiz to build.(such as webpack) - 👍 Simple and powerful, pure React application - 😈 Manage your documentation like a president - 📄 code-block styles
 
 ## :scroll: License
 

lib/index.js

@@ -3,6 +3,7 @@
 const decodeHtml = require("html-encoder-decoder").decode
     , showdown = require("showdown")
     , hljs = require("highlight.js")
+    , classAttr = 'class="'
     ;
 
 module.exports = function showdownHighlight () {
@@ -15,8 +16,16 @@ module.exports = function showdownHighlight () {
                   , flags = "g"
                   , replacement = (wholeMatch, match, left, right) => {
                         match = decodeHtml(match);
-                        let lang = (left.match(/class=\"([^ \"]+)/) || [])[1]
-                        if (lang) {
+                        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;

package-lock.json

@@ -50,6 +50,7 @@
     "description": "This package uses [`highlight.js`](https://highlightjs.org) to highlight code blocks in [Showdown](https://github.com/showdownjs/showdown) output. :rocket:"
   },
   "contributors": [
-    "Cristiano Ribeiro <expedit@gmail.com> (https://github.com/expedit85)"
+    "Cristiano Ribeiro <expedit@gmail.com> (https://github.com/expedit85)",
+    "obedm503 (https://obedm503.github.io)"
   ]
-}
+}

package.json

@@ -6,12 +6,12 @@ const tester = require("tester")
     ;
 
 tester.describe("showdown-highlight", t => {
-    t.should("A Showdown extension for highlight the code blocks.", () => {
-        // After requiring the module, use it as extension
-        let converter = new showdown.Converter({
-            extensions: [showdownHighlight]
-        });
+    // After requiring the module, use it as extension
+    let converter = new showdown.Converter({
+        extensions: [showdownHighlight]
+    });
 
+    t.should("A Showdown extension for highlight the code blocks.", () => {
         // Now you can Highlight code blocks
         let html = converter.makeHtml(`
 \`\`\`js
@@ -22,6 +22,21 @@ sayHello("Hello World", "Johnny");
 \`\`\`
         `);
 
+        t.expect(html.includes('class="hljs js language-js"')).toEqual(true);
         t.expect(html.includes("hljs-string")).toEqual(true);
     });
+
+    t.should("work without code block language", () => {
+        // Now you can Highlight code blocks
+        let html = converter.makeHtml(`
+\`\`\`
+function sayHello (msg, who) {
+  return \`\${who} says: msg\`;
+}
+sayHello("Hello World", "Johnny");
+\`\`\`
+        `);
+
+        t.expect(html.includes('class="hljs"')).toEqual(true);
+    });
 });