Merge pull request #1453 from nknapp/master

Do not add "undefined" to the beginning of the result of .fixMarkup()

src/highlight.js

@@ -593,6 +593,7 @@ https://highlightjs.org/
           } else if (options.tabReplace) {
             return p1.replace(/\t/g, options.tabReplace);
           }
+          return '';
       });
   }
 

test/api/fixmarkup.js

@@ -0,0 +1,21 @@
+'use strict';
+
+let should = require('should');
+let hljs   = require('../../build');
+
+describe('.fixmarkup()', function() {
+  after(function() {
+    hljs.configure({ useBR: false })
+  })
+
+  it('should not add "undefined" to the beginning of the result (#1452)', function() {
+    hljs.configure({ useBR: true })
+    const value = '{ <span class="hljs-attr">"some"</span>: \n <span class="hljs-string">"json"</span> }';
+    const result = hljs.fixMarkup(value);
+
+
+    result.should.equal(
+      '{ <span class="hljs-attr">"some"</span>: <br> <span class="hljs-string">"json"</span> }'
+    );
+  });
+});

test/api/index.js

@@ -9,4 +9,5 @@ describe('hljs', function() {
   require('./starters');
   require('./getLanguage');
   require('./highlight');
+  require('./fixmarkup');
 });