hljs - Fixed invalid line numbering.

Author: alxbl

lib/highlight.js

@@ -18,12 +18,15 @@ function highlightUtil(str, options) {
   var tab = options.tab;
 
   hljs.configure({ classPrefix: useHljs ? 'hljs-' : ''});
-  // If modern hljs support is enabled and there's no gutter, don't wrap the code block.
-  if (useHljs && !gutter) wrap = false;
 
   var data = highlight(str, options);
 
-  if (!wrap) return data.value;
+  if (useHljs && !gutter) wrap = false;
+
+  var before = useHljs ? '<pre><code class="hljs ' + options.lang + '">' : '<pre>';
+  var after = useHljs ? '</code></pre>' : '</pre>';
+
+  if (!wrap) return useHljs ? before + data.value + after : data.value;
 
   var lines = data.value.split('\n');
   var numbers = '';
@@ -50,7 +53,7 @@ function highlightUtil(str, options) {
     result += '<td class="gutter"><pre>' + numbers + '</pre></td>';
   }
 
-  result += '<td class="code"><pre>' + content + '</pre></td>';
+  result += '<td class="code">' + before + content + after + '</td>';
   result += '</tr></table></figure>';
 
   return result;
@@ -130,17 +133,13 @@ function highlight(str, options) {
     return result;
   }
 
-  if (options.hljs) {
-    var res = hljs.highlight(lang, str);
-    res.value = ['<pre><code class="hljs ' + lang + '">', res.value, '</code></pre>'].join('\n');
-    return res;
-  }
-
   if (!tryLanguage(result.language)) {
     result.language = 'plain';
     return result;
   }
 
+  if (options.hljs) return hljs.highlight(lang, str);
+
   return tryHighlight(str, result.language) || result;
 }
 

test/scripts/highlight.js

@@ -268,7 +268,7 @@ describe('highlight', function() {
     validateHtmlAsync(result, done);
   });
 
-  it('hljs compatibility - with lines', () => {
+  it('hljs compatibility - with lines', (done) => {
     var str = [
       'function (a) {',
       '    if (a > 3)',
@@ -281,9 +281,11 @@ describe('highlight', function() {
     result.should.include(codeStart);
     result.should.include('code class="hljs javascript"');
     result.should.include('class="hljs-function"');
+    result.should.include(gutter(1, 5));
+    validateHtmlAsync(result, done);
   });
 
-  it('hljs compatibility - no lines', () => {
+  it('hljs compatibility - no lines', (done) => {
     var str = [
       'function (a) {',
       '    if (a > 3)',
@@ -296,5 +298,6 @@ describe('highlight', function() {
     result.should.not.include(codeStart);
     result.should.include('code class="hljs javascript"');
     result.should.include('class="hljs-function"');
+    validateHtmlAsync(result, done);
   });
 });