fix(highlight): no need to disable 'wrap' when 'hljs' is enabled

hexojs · Nov 19, 2019 · ef769c2 · ef769c2
1 parent ad3541e
commit ef769c2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/lib/highlight.js b/lib/highlight.js
@@ -24,7 +24,6 @@ function highlightUtil(str, options = {}) {
   const lang = options.lang || data.language || '';
   const classNames = (useHljs ? 'hljs' : 'highlight') + (lang ? ` ${lang}` : '');
 
-  if (useHljs && !gutter) wrap = false;
   if (gutter && !wrap) wrap = true; // arbitrate conflict ("gutter:true" takes priority over "wrap:false")
 
   const before = useHljs ? `<pre><code class="${classNames}">` : '<pre>';

diff --git a/test/highlight.spec.js b/test/highlight.spec.js
@@ -295,11 +295,27 @@ describe('highlight', () => {
       '    return false;',
       '}'
     ].join('\n');
-    const result = highlight(str, {hljs: true, gutter: false, lang: 'javascript'});
+    const result = highlight(str, {hljs: true, gutter: false, wrap: false, lang: 'javascript'});
     result.should.not.include(gutterStart);
     result.should.not.include(codeStart);
     result.should.include('code class="hljs javascript"');
     result.should.include('class="hljs-function"');
     validateHtmlAsync(result, done);
   });
+
+  it('hljs compatibility - wrap is true', done => {
+    const str = [
+      'function (a) {',
+      '    if (a > 3)',
+      '        return true;',
+      '    return false;',
+      '}'
+    ].join('\n');
+    const result = highlight(str, {hljs: true, gutter: false, wrap: true, lang: 'javascript'});
+    result.should.not.include(gutterStart);
+    result.should.include(codeStart);
+    result.should.include('code class="hljs javascript"');
+    result.should.include('class="hljs-function"');
+    validateHtmlAsync(result, done);
+  });
 });