Subramanya Sastry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/155353
Change subject: Rename DOMUtils.isTplElementNode --> isTplOrExtToplevelNode
......................................................................
Rename DOMUtils.isTplElementNode --> isTplOrExtToplevelNode
* The name was confusing me in a new patch I was working on.
I wanted to process template or extension content and thought
I had to add additional code, but realized that the poorly
named helper was handling both template and extension content.
In the past, we've had some discussions about this common pattern
in Parsoid code where "template content" is used as a proxy for
generated content -- either by templates or extensions but due to
lack of a good name, we left the proxy name as is in most places in
the codebase. As expected, after coming back to this code after
a long time, I did get confused by the name.
Change-Id: Idb24adae3d3f6039856851cfc17e89b393cf6458
---
M lib/dom.linter.js
M lib/dom.markFosteredContent.js
M lib/dom.markTreeBuilderFixups.js
M lib/dom.t.handleLinkNeighbours.js
M lib/mediawiki.DOMDiff.js
M lib/mediawiki.DOMUtils.js
M tests/parserTests.js
7 files changed, 13 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/53/155353/1
diff --git a/lib/dom.linter.js b/lib/dom.linter.js
index d585996..275667f 100644
--- a/lib/dom.linter.js
+++ b/lib/dom.linter.js
@@ -87,7 +87,7 @@
// 1. c is a void element
// 2. c is not self-closed
// 3. c is not tbody
- if ( DU.isTplElementNode(env, c) ||
+ if ( DU.isTplOrExtToplevelNode(env, c) ||
(!Util.isVoidElement(cNodeName) &&
!dp.selfClose &&
cNodeName !== 'tbody' &&
@@ -257,7 +257,7 @@
// Store info from the first node of an about id group.
// Nested templates aren't an issue because we expand top-level
// templates with the mediawiki api.
- if ( !tmpl && DU.isTplElementNode(env, c) ) {
+ if ( !tmpl && DU.isTplOrExtToplevelNode(env, c) ) {
var about = c.getAttribute('about');
tmpl = {
last: DU.getAboutSiblings(c, about).last(),
diff --git a/lib/dom.markFosteredContent.js b/lib/dom.markFosteredContent.js
index 67a1729..903df5c 100644
--- a/lib/dom.markFosteredContent.js
+++ b/lib/dom.markFosteredContent.js
@@ -67,7 +67,7 @@
// between so keep track of that, and backtrack when necessary.
while ( sibling ) {
if ( !DU.isTplStartMarkerMeta( sibling ) && (
- DU.isTplElementNode( env, sibling ) ||
+ DU.isTplOrExtToplevelNode( env, sibling ) ||
DU.isMarkerMeta( sibling, "mw:EndTag" ) ||
DU.isMarkerMeta( sibling, "mw:TransclusionShadow" )
)) {
diff --git a/lib/dom.markTreeBuilderFixups.js b/lib/dom.markTreeBuilderFixups.js
index 4ed79b9..12a37f7 100644
--- a/lib/dom.markTreeBuilderFixups.js
+++ b/lib/dom.markTreeBuilderFixups.js
@@ -165,7 +165,7 @@
while (c !== null) {
// Skip over template/extension content
- if (DU.isTplElementNode( env, node )) {
+ if (DU.isTplOrExtToplevelNode( env, node )) {
var about = node.getAttribute( 'about' );
c = c.nextSibling;
while (c && node.getAttribute('about') === about) {
diff --git a/lib/dom.t.handleLinkNeighbours.js
b/lib/dom.t.handleLinkNeighbours.js
index addd297..b01f7fb 100644
--- a/lib/dom.t.handleLinkNeighbours.js
+++ b/lib/dom.t.handleLinkNeighbours.js
@@ -18,7 +18,7 @@
return null;
}
- if ( node !== null && DU.isTplElementNode( env, node ) ) {
+ if ( node !== null && DU.isTplOrExtToplevelNode( env, node ) ) {
baseAbout = node.getAttribute( 'about' );
}
@@ -37,7 +37,7 @@
return null;
}
- if ( node !== null && DU.isTplElementNode( env, node ) ) {
+ if ( node !== null && DU.isTplOrExtToplevelNode( env, node ) ) {
baseAbout = node.getAttribute( 'about' );
}
@@ -77,7 +77,7 @@
value.content = null;
break;
}
- } else if ( DU.isTplElementNode( env, node ) &&
+ } else if ( DU.isTplOrExtToplevelNode( env, node ) &&
baseAbout !== '' && baseAbout !== null &&
node.getAttribute( 'about' ) === baseAbout ) {
value = getInnerNeighbour( env, node[innerNode] );
@@ -156,7 +156,7 @@
if ( trail.src.length > 0 ) {
dp.tail = trail.src;
var about = node.getAttribute('about');
- if ( DU.isTplElementNode( env, node ) &&
+ if ( DU.isTplOrExtToplevelNode( env, node ) &&
DU.getAboutSiblings( node, about ).length === 1
) {
// search back for the first wrapper but
diff --git a/lib/mediawiki.DOMDiff.js b/lib/mediawiki.DOMDiff.js
index e1bc5f5..cfecf81 100644
--- a/lib/mediawiki.DOMDiff.js
+++ b/lib/mediawiki.DOMDiff.js
@@ -160,7 +160,7 @@
};
function nextNonTemplateSibling(env, node) {
- return DU.isTplElementNode(env, node) ?
DU.skipOverEncapsulatedContent(node) : node.nextSibling;
+ return DU.isTplOrExtToplevelNode(env, node) ?
DU.skipOverEncapsulatedContent(node) : node.nextSibling;
}
/**
@@ -265,7 +265,7 @@
// Mark as modified, and recurse.
this.debug("--found diff:
modified-wrapper--");
this.markNode(savedNewNode,
'modified-wrapper');
- if (!DU.isTplElementNode(this.env,
baseNode) && !DU.isTplElementNode(this.env, savedNewNode)) {
+ if
(!DU.isTplOrExtToplevelNode(this.env, baseNode) &&
!DU.isTplOrExtToplevelNode(this.env, savedNewNode)) {
// Dont recurse into
template-like-content
this.doDOMDiff(baseNode,
savedNewNode);
}
@@ -291,7 +291,7 @@
this.markNode(newParentNode, 'children-changed');
foundDiffOverall = true;
- } else if (!DU.isTplElementNode(this.env, baseNode) &&
!DU.isTplElementNode(this.env, newNode)) {
+ } else if (!DU.isTplOrExtToplevelNode(this.env, baseNode) &&
!DU.isTplOrExtToplevelNode(this.env, newNode)) {
this.debug("--shallow equal: recursing--");
// Recursively diff subtrees if not template-like
content
var subtreeDiffers = this.doDOMDiff(baseNode, newNode);
diff --git a/lib/mediawiki.DOMUtils.js b/lib/mediawiki.DOMUtils.js
index de53922..9482c9c 100644
--- a/lib/mediawiki.DOMUtils.js
+++ b/lib/mediawiki.DOMUtils.js
@@ -740,7 +740,7 @@
* @param {MWParserEnvironment} env
* @param {Node} node
*/
- isTplElementNode: function(env, node) {
+ isTplOrExtToplevelNode: function(env, node) {
if (isElt(node)) {
var about = node.getAttribute('about');
return about && env.isParsoidObjectId(about);
diff --git a/tests/parserTests.js b/tests/parserTests.js
index b6b06ba..33004b2 100755
--- a/tests/parserTests.js
+++ b/tests/parserTests.js
@@ -673,7 +673,7 @@
* Currently true for template and extension content, and for entities.
*/
function domSubtreeIsEditable(env, node) {
- return !DU.isTplElementNode(env, node) &&
+ return !DU.isTplOrExtToplevelNode(env, node) &&
!(DU.isElt(node) && node.getAttribute("typeof") ===
"mw:Entity");
}
--
To view, visit https://gerrit.wikimedia.org/r/155353
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb24adae3d3f6039856851cfc17e89b393cf6458
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
