Arlolra has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/398189 )
Change subject: Template syntax w/ empty link target shouldn't be considered broken ...................................................................... Template syntax w/ empty link target shouldn't be considered broken The spec at https://www.mediawiki.org/wiki/Preprocessor_ABNF says the link target can be zero or more xml characters. This improves both the render and parse time for enwiki/User:Pdebee Bug: T143378 Change-Id: Iaf7221571b79dfbe5d1f32be9476ff0b2d8ac821 --- M lib/wt2html/pegTokenizer.pegjs M tests/parserTests.txt 2 files changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid refs/changes/89/398189/1 diff --git a/lib/wt2html/pegTokenizer.pegjs b/lib/wt2html/pegTokenizer.pegjs index e1bd3f9..17495b2 100644 --- a/lib/wt2html/pegTokenizer.pegjs +++ b/lib/wt2html/pegTokenizer.pegjs @@ -890,7 +890,7 @@ params.unshift(new KV(tu.flattenIfArray(target.tokens), '', target.srcOffsets)); var obj = new SelfclosingTagTk('template', params, { tsr: tsrOffsets(), src: text() }); return obj; - } / $('{{' space_or_newline+ '}}') + } / $('{{' space_or_newline* '}}') tplarg = stopLen:("" { return stops.push('preproc', /* {{ */'}}'); }) diff --git a/tests/parserTests.txt b/tests/parserTests.txt index c729776..0e234de 100644 --- a/tests/parserTests.txt +++ b/tests/parserTests.txt @@ -12633,6 +12633,19 @@ <p><span typeof="mw:LanguageVariant" data-mw-variant='{"disabled":{"t":"<span about=\"#mwt1\" typeof=\"mw:Transclusion\" data-parsoid='{\"pi\":[[{\"k\":\"1\"}]],\"dsr\":[2,14,null,null]}' data-mw='{\"parts\":[{\"template\":{\"target\":{\"wt\":\"echo\",\"href\":\"./Template:Echo\"},\"params\":{\"1\":{\"wt\":\"foo\"}},\"i\":0}}]}'>foo</span>bar"}}'></span></p> !! end +!! test +Preprocessor precedence 17: template w/o target shouldn't prevent closing +!! options +parsoid=wt2html +!! wikitext +{{echo|hi {{}}}} +!! html/php +<p>hi {{}} +</p> +!! html/parsoid +<p about="#mwt1" typeof="mw:Transclusion" data-mw='{"parts":[{"template":{"target":{"wt":"echo","href":"./Template:Echo"},"params":{"1":{"wt":"hi {{}}"}},"i":0}}]}'>hi {{}}</p> +!! end + ### ### Token Stream Patcher tests ### -- To view, visit https://gerrit.wikimedia.org/r/398189 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaf7221571b79dfbe5d1f32be9476ff0b2d8ac821 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: Arlolra <abrea...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
