Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

(fix) fixMarkup would rarely destroy markup when useBR was enabled #2532

Merged
merged 4 commits into from May 8, 2020
Merged

(fix) fixMarkup would rarely destroy markup when useBR was enabled #2532

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ceebefb
fix markup is broken
joshgoebel May 5, 2020
743acd5
fix
joshgoebel May 7, 2020
7ec291f
Merge branch 'master' into fix_makrup
joshgoebel May 7, 2020
2bac5a9
Update src/highlight.js
joshgoebel May 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 13 additions & 3 deletions test/api/fixmarkup.js
View file
Open in desktop
Expand Up @@ -5,11 +5,21 @@ const hljs = require('../../build');

describe('.fixmarkup()', () => {
after(() => {
hljs.configure({ useBR: false })
})
hljs.configure({ useBR: false });
});

it('should not strip HTML from beginning of strings', () => {
hljs.configure({ useBR: true });
const value = '<span class="hljs-attr">"some"</span>: \n <span class="hljs-string">"json"</span>';
joshgoebel marked this conversation as resolved.
Show resolved Hide resolved
const result = hljs.fixMarkup(value);

result.should.equal(
'<span class="hljs-attr">"some"</span>: <br> <span class="hljs-string">"json"</span>'
);
});

it('should not add "undefined" to the beginning of the result (#1452)', () => {
hljs.configure({ useBR: true })
hljs.configure({ useBR: true });
const value = '{ <span class="hljs-attr">"some"</span>: \n <span class="hljs-string">"json"</span> }';
const result = hljs.fixMarkup(value);

Expand Down