From 479eb64a7691662ae415bf9b8faa112b5befa9b8 Mon Sep 17 00:00:00 2001 From: Jens Maier Date: Sun, 27 Jul 2014 16:07:47 +0200 Subject: [PATCH] FIX: rewrite replaceBlock logic to better handle mismatched nested quotes. --- .../discourse/dialects/code_dialect.js | 13 +- .../javascripts/discourse/dialects/dialect.js | 144 ++++++++---------- test/javascripts/lib/bbcode_test.js | 10 ++ test/javascripts/lib/markdown_test.js | 2 +- 4 files changed, 85 insertions(+), 84 deletions(-) diff --git a/app/assets/javascripts/discourse/dialects/code_dialect.js b/app/assets/javascripts/discourse/dialects/code_dialect.js index 8f0ff739a2..5bb5d6b8b0 100644 --- a/app/assets/javascripts/discourse/dialects/code_dialect.js +++ b/app/assets/javascripts/discourse/dialects/code_dialect.js @@ -10,6 +10,15 @@ var acceptableCodeClasses = "profile", "python", "r", "rib", "rsl", "ruby", "rust", "scala", "smalltalk", "sql", "tex", "text", "vala", "vbscript", "vhdl"]; +function flattenBlocks(blocks) { + var result = ""; + blocks.forEach(function(b) { + result += b; + if (b.trailing) { result += b.trailing; } + }); + return result; +} + Discourse.Dialect.replaceBlock({ start: /^`{3}([^\n\[\]]+)?\n?([\s\S]*)?/gm, stop: '```', @@ -19,7 +28,7 @@ Discourse.Dialect.replaceBlock({ if (matches[1] && acceptableCodeClasses.indexOf(matches[1]) !== -1) { klass = matches[1]; } - return ['p', ['pre', ['code', {'class': klass}, blockContents.join("\n") ]]]; + return ['p', ['pre', ['code', {'class': klass}, flattenBlocks(blockContents) ]]]; } }); @@ -50,6 +59,6 @@ Discourse.Dialect.replaceBlock({ skipIfTradtionalLinebreaks: true, emitter: function(blockContents) { - return ['p', ['pre', blockContents.join("\n")]]; + return ['p', ['pre', flattenBlocks(blockContents)]]; } }); diff --git a/app/assets/javascripts/discourse/dialects/dialect.js b/app/assets/javascripts/discourse/dialects/dialect.js index 67f7cb8cc9..94d81d1d0e 100644 --- a/app/assets/javascripts/discourse/dialects/dialect.js +++ b/app/assets/javascripts/discourse/dialects/dialect.js @@ -133,6 +133,19 @@ function invalidBoundary(args, prev) { if (args.spaceOrTagBoundary && (!last.match(/(\s|\>)$/))) { return true; } } +/** + Returns the number of (terminated) lines in a string. + + @method countLines + @param {string} str the string. + @returns {Integer} number of terminated lines in str +**/ +function countLines(str) { + var index = -1, count = 0; + while ((index = str.indexOf("\n", index + 1)) !== -1) { count++; } + return count; +} + /** An object used for rendering our dialects. @@ -359,102 +372,71 @@ Discourse.Dialect = { var linebreaks = dialect.options.traditional_markdown_linebreaks || Discourse.SiteSettings.traditional_markdown_linebreaks; - - // Some replacers should not be run with traditional linebreaks if (linebreaks && args.skipIfTradtionalLinebreaks) { return; } args.start.lastIndex = 0; - var m = (args.start).exec(block); + var result = [], match = (args.start).exec(block); + if (!match) { return; } - if (!m) { return; } + var lastChance = function() { + return !next.some(function(e) { return e.indexOf(args.stop) !== -1; }); + }; - var startPos = args.start.lastIndex - m[0].length, - leading, - blockContents = [], - result = [], - lineNumber = block.lineNumber; - - if (startPos > 0) { - leading = block.slice(0, startPos); - lineNumber += (leading.split("\n").length - 1); - - var para = ['p']; - this.processInline(leading).forEach(function (l) { - para.push(l); - }); - - result.push(para); + // shave off start tag and leading text, if any. + var pos = args.start.lastIndex - match[0].length, + leading = block.slice(0, pos), + trailing = match[2] ? match[2].replace(/^\n*/, "") : ""; + if (block.indexOf(args.stop, pos + args.stop.length) === -1 && lastChance()) { return; } + if (leading.length > 0) { result.push(['p'].concat(this.processInline(leading))); } + if (trailing.length > 0) { + next.unshift(MD.mk_block(trailing, block.trailing, + block.lineNumber + countLines(leading) + (match[2] ? match[2].length : 0) - trailing.length)); } - if (m[2]) { - next.unshift(MD.mk_block(m[2], null, lineNumber + 1)); - } + // find matching stop tag in blocks. + var contentBlocks = [], nesting = 0, endPos, ep, offset, startPos, sp, m, b; + blockloop: + while (b = next.shift()) { + args.start.lastIndex = 0; + startPos = []; sp = 0; + while (m = (args.start).exec(b)) { + startPos.push(args.start.lastIndex - m[0].length); + args.start.lastIndex = args.start.lastIndex - (m[2] ? m[2].length : 0); + } + endPos = []; ep = 0; offset = 0; + while ((pos = b.indexOf(args.stop, offset)) !== -1) { + endPos.push(pos); + offset += (pos + args.stop.length); + } - lineNumber++; + while (ep < endPos.length) { + if (sp < startPos.length && startPos[sp] < endPos[ep]) { + sp++; nesting++; + } else if (nesting > 0) { + ep++; nesting--; + } else { + break blockloop; + } + } - var blockClosed = false; - for (var i=0; i= 0) { - blockClosed = true; + if (lastChance()) { + ep = endPos.length - 1; break; } + + nesting += startPos.length - sp; + contentBlocks.push(b); } - if (!blockClosed) { - if (m[2]) { next.shift(); } - return; + if (ep < endPos.length) { + var before = b.slice(0, endPos[ep]).replace(/\n*$/, ""), + after = b.slice(endPos[ep] + args.stop.length).replace(/^\n*/, ""); + if (before.length > 0) contentBlocks.push(MD.mk_block(before, "", b.lineNumber)); + if (after.length > 0) next.unshift(MD.mk_block(after, "", b.lineNumber + countLines(before))); } - var numOpen = 1; - while (next.length > 0) { - var b = next.shift(), - blockLine = b.lineNumber, - diff = ((typeof blockLine === "undefined") ? lineNumber : blockLine) - lineNumber, - endFound = b.indexOf(args.stop), - leadingContents = b.slice(0, endFound), - trailingContents = b.slice(endFound+args.stop.length), - m2; - - if (endFound === -1) { - leadingContents = b; - } - - args.start.lastIndex = 0; - if (m2 = (args.start).exec(leadingContents)) { - numOpen++; - args.start.lastIndex -= m2[0].length - 1; - while (m2 = (args.start).exec(leadingContents)) { - numOpen++; - args.start.lastIndex -= m2[0].length - 1; - } - } - - if (endFound >= 0) { numOpen--; } - for (var j=1; j= 0) { - if (trailingContents) { - next.unshift(MD.mk_block(trailingContents.replace(/^\s+/, ""))); - } - - blockContents.push(leadingContents.replace(/\s+$/, "")); - - if (numOpen === 0) { - break; - } - blockContents.push(args.stop); - } else { - blockContents.push(b); - } - } - - var emitterResult = args.emitter.call(this, blockContents, m, dialect.options); - if (emitterResult) { - result.push(emitterResult); - } + var emitterResult = args.emitter.call(this, contentBlocks, match, dialect.options); + if (emitterResult) { result.push(emitterResult); } return result; }); }, diff --git a/test/javascripts/lib/bbcode_test.js b/test/javascripts/lib/bbcode_test.js index f07c1274a2..9d26b1fa63 100644 --- a/test/javascripts/lib/bbcode_test.js +++ b/test/javascripts/lib/bbcode_test.js @@ -129,6 +129,16 @@ test("quote formatting", function() { "

abc

\n\n

hello

", "handles new lines properly"); + formatQ("[quote=\"Alice, post:1, topic:1\"]\n[quote=\"Bob, post:2, topic:1\"]\n[/quote]\n[/quote]", + "", + "quotes can be nested"); + + formatQ("[quote=\"Alice, post:1, topic:1\"]\n[quote=\"Bob, post:2, topic:1\"]\n[/quote]", + "", + "handles mismatched nested quote tags"); }); test("quotes with trailing formatting", function() { diff --git a/test/javascripts/lib/markdown_test.js b/test/javascripts/lib/markdown_test.js index 7524aa6878..85f8cf40b5 100644 --- a/test/javascripts/lib/markdown_test.js +++ b/test/javascripts/lib/markdown_test.js @@ -301,7 +301,7 @@ test("links with full urls", function() { test("Code Blocks", function() { cooked("
\nhello\n
\n", - "

\nhello

", + "

hello

", "pre blocks don't include extra lines"); cooked("```\na\nb\nc\n\nd\n```",