GWicke has uploaded a new change for review.
https://gerrit.wikimedia.org/r/96407
Change subject: Properly reset inPre state in the pre handler
......................................................................
Properly reset inPre state in the pre handler
Also added a parser test that currently fails in html2wt and html2html mode
ase we are collapsing two adjacent pre elements into one (bug 57276).
Change-Id: I7c63a44ce24dfcaea3f1f573eee1ce38a3410d46
---
M js/lib/ext.core.PreHandler.js
M js/tests/parserTests-blacklist.js
M js/tests/parserTests.txt
3 files changed, 14 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid
refs/changes/07/96407/1
diff --git a/js/lib/ext.core.PreHandler.js b/js/lib/ext.core.PreHandler.js
index ad4ac3b..ddbf044 100644
--- a/js/lib/ext.core.PreHandler.js
+++ b/js/lib/ext.core.PreHandler.js
@@ -133,6 +133,7 @@
handler.manager.addTransform(handler.onAny.bind(handler),
"PreHandler:onAny", handler.anyRank, 'any');
}
+ handler.inPre = false;
};
PreHandler.prototype.moveToIgnoreState = function() {
diff --git a/js/tests/parserTests-blacklist.js
b/js/tests/parserTests-blacklist.js
index e046e52..d66ce46 100644
--- a/js/tests/parserTests-blacklist.js
+++ b/js/tests/parserTests-blacklist.js
@@ -712,6 +712,7 @@
add("html2html", "<pre> with forbidden attribute values (bug 3202)");
add("html2html", "<nowiki> inside <pre> (bug 13238)");
add("html2html", "Empty pre; pre inside other HTML tags (bug 54946)");
+add("html2html", "HTML pre followed by indent-pre");
add("html2html", "3a. Indent-Pre and block tags (single-line html)");
add("html2html", "3b. Indent-Pre and block tags (pre-content on separate
line)");
add("html2html", "4. Multiple spaces at start-of-line");
@@ -1267,6 +1268,7 @@
add("html2wt", "<nowiki> and <pre> preference (first one wins)");
add("html2wt", "</pre> inside nowiki");
add("html2wt", "Empty pre; pre inside other HTML tags (bug 54946)");
+add("html2wt", "HTML pre followed by indent-pre");
add("html2wt", "Templates: Indent-Pre: 1a. Templates that break a line should
suppress <pre>");
add("html2wt", "Templates: Indent-Pre: 1b. Templates that break a line should
suppress <pre>");
add("html2wt", "Templates: Indent-Pre: 1c: Wrapping should be based on
expanded content");
diff --git a/js/tests/parserTests.txt b/js/tests/parserTests.txt
index 47c146e..bb70846 100644
--- a/js/tests/parserTests.txt
+++ b/js/tests/parserTests.txt
@@ -1608,6 +1608,17 @@
!! end
+!! test
+HTML pre followed by indent-pre
+!! input
+<pre>foo</pre>
+ bar
+!! result
+<pre>foo</pre>
+<pre>bar
+</pre>
+!! end
+
!!test
Templates: Indent-Pre: 1a. Templates that break a line should suppress <pre>
!!input
--
To view, visit https://gerrit.wikimedia.org/r/96407
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c63a44ce24dfcaea3f1f573eee1ce38a3410d46
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: GWicke <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
