Update for new highlight.js

Author: tmcw

lib/output/html.js

@@ -1,42 +1,6 @@
 'use strict';
 
-var walk = require('../walk'),
-  path = require('path'),
-  hljs = require('highlight.js');
-
-/**
- * Create a highlighter function that transforms strings of code
- * into strings of HTML with highlighting tags.
- *
- * @param {boolean} auto whether to automatically detect a language
- * @returns {Function} highlighter function
- */
-function highlightString(auto) {
-  return function (example) {
-    if (auto) {
-      return hljs.highlightAuto(example || '').value;
-    }
-    return hljs.highlight('js', example || '').value;
-  };
-}
-
-/**
- * Highlights the contents of the `example` tag.
- * @name highlight
- * @param {Object} comment parsed comment
- * @param {Object} [options] options
- * @return {Object} comment with highlighted code
- */
-function highlight(comment, options) {
-  var hljsOptions = options.hljs || {};
-  hljs.configure(hljsOptions);
-
-  if (comment.examples) {
-    comment.examples = comment.examples.map(highlightString(hljsOptions.highlightAuto));
-  }
-
-  return comment;
-}
+var path = require('path');
 
 /**
  * Formats documentation as HTML.
@@ -50,7 +14,6 @@ function highlight(comment, options) {
  */
 module.exports = function makeHTML(comments, options, callback) {
   options = options || {};
-  comments = walk(comments, highlight, options);
   var theme = require('documentation-theme-default');
   if (options.theme) {
     theme = require(path.resolve(process.cwd(), options.theme));

package.json

@@ -23,16 +23,16 @@
     "extend": "^3.0.0",
     "get-comments": "^1.0.1",
     "github-url-from-git": "^1.4.0",
-    "highlight.js": "^8.4.0",
+    "highlight.js": "^9.1.0",
     "js-yaml": "^3.3.1",
     "jsdoc-inline-lex": "^1.0.1",
-    "remark": "^3.0.0",
-    "remark-toc": "^2.0.0",
     "mdast-util-inject": "^1.1.0",
     "micromatch": "^2.1.6",
     "mime": "^1.3.4",
     "module-deps": "^4.0.2",
     "parse-filepath": "^0.6.3",
+    "remark": "^3.0.0",
+    "remark-toc": "^2.0.0",
     "remote-origin-url": "^0.4.0",
     "resolve": "^1.1.6",
     "slugg": "^0.1.2",

test/bin.js

@@ -259,7 +259,7 @@ test('write to html, highlightAuto', function (t) {
       var result = fs.readFileSync(path.join(dstDir, 'index.html'), 'utf8');
       t.ok(result.indexOf('<span class="hljs-number">42</span>') > 0,
         'javascript is recognized by highlightjs');
-      t.ok(result.indexOf('<span class="hljs-attr_selector">[data-foo]</span>') > 0,
+      t.ok(result.indexOf('<span class="hljs-attr">[data-foo]</span>') > 0,
         'css is recognized by highlightjs');
       t.ok(result.indexOf('<span class="hljs-attribute">data-foo</span>') > 0,
         'html is recognized by highlightjs');