jenkins-bot has submitted this change and it was merged.
Change subject: [WTS] Bug fix stripping indent-pre nowikis in scrubWikitext mode
......................................................................
[WTS] Bug fix stripping indent-pre nowikis in scrubWikitext mode
* Additional whitespace following the nowiki should be stripped
as well.
* Updated tests to capture this.
Change-Id: Ife4d66177718023963d8fb78c7198c0ef16f9474
---
M lib/mediawiki.WikitextSerializer.js
M tests/parserTests.txt
2 files changed, 7 insertions(+), 0 deletions(-)
Approvals:
Arlolra: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/mediawiki.WikitextSerializer.js
b/lib/mediawiki.WikitextSerializer.js
index d73b723..e2b75aa 100644
--- a/lib/mediawiki.WikitextSerializer.js
+++ b/lib/mediawiki.WikitextSerializer.js
@@ -1246,6 +1246,7 @@
nowiki = nowiki.replace(/^<nowiki>(\s+)<\/nowiki>/,
'$1');
} else if (env.scrubWikitext) {
nowiki = nowiki.replace(/^<nowiki>(\s+)<\/nowiki>/, '');
+ rest = rest.replace(/^\s*/, '');
}
out = out + nowiki + rest + pieces[i + 3];
}
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 55187a9..3cbc0bd 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -24880,8 +24880,11 @@
}
!! html
<p> hi</p>
+<p> hello</p>
!! wikitext
hi
+
+hello
!! end
!! test
@@ -24890,8 +24893,11 @@
parsoid=html2wt
!! html
<p> hi</p>
+<p> hello</p>
!! wikitext
<nowiki> </nowiki>hi
+
+<nowiki> </nowiki> hello
!! end
# ---------------------------------------------------
--
To view, visit https://gerrit.wikimedia.org/r/225250
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ife4d66177718023963d8fb78c7198c0ef16f9474
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: Arlolra <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
