Description: Fix smartquotes perfomance Author: Vitaly Puzrin Origin: upstream, https://github.com/markdown-it/markdown-it/commit/9ce20875 Bug: https://github.com/markdown-it/markdown-it/security/advisories/GHSA-6v5v-wf23-fmfq Bug-Debian: 1140349 Forwarded: not-needed Applied-Upstream: 14.2.0, commit:9ce20875 Reviewed-By: Xavier Guimard --- a/lib/rules_core/smartquotes.js +++ b/lib/rules_core/smartquotes.js @@ -12,8 +12,28 @@ var APOSTROPHE = '\u2019'; /* ’ */ -function replaceAt(str, index, ch) { - return str.substr(0, index) + ch + str.substr(index + 1); +function addReplacement (replacements, tokenIdx, pos, ch) { + if (!replacements[tokenIdx]) { + replacements[tokenIdx] = [] + } + + replacements[tokenIdx].push({ pos, ch }) +} + +function applyReplacements (str, replacements) { + let result = '' + let lastPos = 0 + + replacements.sort((a, b) => a.pos - b.pos) + + for (let i = 0; i < replacements.length; i++) { + const replacement = replacements[i] + + result += str.slice(lastPos, replacement.pos) + replacement.ch + lastPos = replacement.pos + 1 + } + + return result + str.slice(lastPos) } function process_inlines(tokens, state) { @@ -22,6 +42,8 @@ canOpen, canClose, j, isSingle, stack, openQuote, closeQuote; stack = []; + // token index -> list of replacements in the original token content + const replacements = {} for (i = 0; i < tokens.length; i++) { token = tokens[i]; @@ -122,7 +144,7 @@ if (!canOpen && !canClose) { // middle of word if (isSingle) { - token.content = replaceAt(token.content, t.index, APOSTROPHE); + addReplacement(replacements, i, t.index, APOSTROPHE) } continue; } @@ -143,18 +165,8 @@ closeQuote = state.md.options.quotes[1]; } - // replace token.content *before* tokens[item.token].content, - // because, if they are pointing at the same token, replaceAt - // could mess up indices when quote length != 1 - token.content = replaceAt(token.content, t.index, closeQuote); - tokens[item.token].content = replaceAt( - tokens[item.token].content, item.pos, openQuote); - - pos += closeQuote.length - 1; - if (item.token === i) { pos += openQuote.length - 1; } - - text = token.content; - max = text.length; + addReplacement(replacements, i, t.index, closeQuote); + addReplacement(replacements, item.token, item.pos, openQuote); stack.length = j; continue OUTER; @@ -170,13 +182,15 @@ level: thisLevel }); } else if (canClose && isSingle) { - token.content = replaceAt(token.content, t.index, APOSTROPHE); + addReplacement(replacements, i, t.index, APOSTROPHE) } } } + Object.keys(replacements).forEach(function (tokenIdx) { + tokens[tokenIdx].content = applyReplacements(tokens[tokenIdx].content, replacements[tokenIdx]); + }); } - module.exports = function smartquotes(state) { /*eslint max-depth:0*/ var blkIdx;