Fix code highlighing (#28)

blamebutton · Aug 23, 2020 · 4879c04 · 4879c04
1 parent c934344
commit 4879c04
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/index.js b/index.js
diff --git a/src/renderer/markdown-renderer.ts b/src/renderer/markdown-renderer.ts
@@ -1,6 +1,6 @@
 import FileRenderer from './file-renderer';
 import * as MarkdownIt from 'markdown-it';
-import {getLanguage} from 'highlight.js';
+import {getLanguage, highlight} from 'highlight.js';
 import * as tocPlugin from 'markdown-it-toc-done-right';
 import * as anchorPlugin from 'markdown-it-anchor';
 import * as umlPlugin from 'markdown-it-textual-uml';
@@ -13,8 +13,8 @@ export class MarkdownRenderer implements FileRenderer {
   constructor() {
     this.markdown = new MarkdownIt({
       typographer: true,
+      highlight: (str, lang) => this.highlight(str, lang),
       linkify: true,
-      highlight: MarkdownRenderer.highlight,
       html: true,
     });
     // @ts-ignore
@@ -23,15 +23,16 @@ export class MarkdownRenderer implements FileRenderer {
     this.markdown.use(umlPlugin);
   }
 
-  private static highlight(str: string, lang: string) {
+  private highlight(str: string, lang: string) {
+    let code = '';
+
     if (lang && getLanguage(lang)) {
-      try {
-        return MarkdownRenderer.highlight(lang, str).value;
-      } catch (_) {
-      }
-      return ''; // use external default escaping
+      code = highlight(lang, str, true).value;
+    } else {
+      code = this.markdown.utils.escapeHtml(str);
     }
-    return null;
+
+    return `<pre class="hljs"><code>${code}</code></pre>`;
   }
 
   /**