Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/231418
Change subject: Rename `generic_newline_attribute` to
`generic_multiline_attribute`
......................................................................
Rename `generic_newline_attribute` to `generic_multiline_attribute`
Change-Id: I04af0338a19c8f56a1003973d741022a25ea0f2d
---
M lib/ext.core.AttributeExpander.js
M lib/mediawiki.WikitextSerializer.js
M lib/mediawiki.tokenizer.peg.js
M lib/pegTokenizer.pegjs.txt
4 files changed, 11 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/18/231418/1
diff --git a/lib/ext.core.AttributeExpander.js
b/lib/ext.core.AttributeExpander.js
index fd4fd95..c8f7774 100644
--- a/lib/ext.core.AttributeExpander.js
+++ b/lib/ext.core.AttributeExpander.js
@@ -335,7 +335,7 @@
// (See documentation comment above)
if (expandedA.v === '') {
var kStr =
Util.tokensToString(expandedK);
- var rule = nlTkOkay ?
'generic_newline_attributes' : 'table_attributes';
+ var rule = nlTkOkay ?
'generic_multiline_attributes' : 'table_attributes';
var kvs = /=/.test(kStr) ?
this.tokenizer.tokenize(kStr, rule) : null;
if (kvs) {
// SSS FIXME: Collect
all keys here, not just the first key
diff --git a/lib/mediawiki.WikitextSerializer.js
b/lib/mediawiki.WikitextSerializer.js
index b052fe7..4f9b0e4 100644
--- a/lib/mediawiki.WikitextSerializer.js
+++ b/lib/mediawiki.WikitextSerializer.js
@@ -266,7 +266,7 @@
v = this.getAttributeValue(node, kv.k, v);
// Remove encapsulation from protected attributes
- // in pegTokenizer.pegjs.txt:generic_newline_attribute
+ // in pegTokenizer.pegjs.txt:generic_multiline_attribute
k = k.replace(/^data-x-/i, '');
if (v.length > 0) {
diff --git a/lib/mediawiki.tokenizer.peg.js b/lib/mediawiki.tokenizer.peg.js
index 9be7047..04e20b8 100644
--- a/lib/mediawiki.tokenizer.peg.js
+++ b/lib/mediawiki.tokenizer.peg.js
@@ -180,7 +180,7 @@
"url",
"single_cell_table_args",
"table_attributes",
- "generic_newline_attributes",
+ "generic_multiline_attributes",
"tplarg_or_template_or_bust",
],
allowedStreamRules: [
diff --git a/lib/pegTokenizer.pegjs.txt b/lib/pegTokenizer.pegjs.txt
index acfc58b..8597646 100644
--- a/lib/pegTokenizer.pegjs.txt
+++ b/lib/pegTokenizer.pegjs.txt
@@ -101,7 +101,7 @@
}
// These rules are exposed as start rules.
-generic_newline_attributes "generic_newline_attributes" =
generic_newline_attribute*
+generic_multiline_attributes "generic_multiline_attributes" =
generic_multiline_attribute*
table_attributes "table_attributes" = table_attribute*
/* The 'redirect' magic word.
@@ -896,7 +896,7 @@
= & { return stops.inc('pre'); }
s:spaces // XXX: capture space for round-tripping
"<" pre_tag_name
- attribs:generic_newline_attributes
+ attribs:generic_multiline_attributes
">"
l:nested_block_line
ls:(sol pre_indent_line)*
@@ -925,7 +925,7 @@
pre
= & { return stops.inc('pre'); }
"<" pre_tag_name
- attribs:generic_newline_attributes
+ attribs:generic_multiline_attributes
space*
endpos:(">" { return endOffset(); })
// MediaWiki <pre> is special in that it converts all pre content to plain
@@ -1181,7 +1181,7 @@
generic_tag
= "<"
end:"/"? name:tag_name
- attribs:generic_newline_attributes
+ attribs:generic_multiline_attributes
space_or_newline* // No need to preserve this -- canonicalize on RT via
dirty diff
selfclose:"/"?
bad_ws:space* // No need to preserve this -- canonicalize on RT via dirty
diff
@@ -1224,13 +1224,13 @@
'<' ('!--' / 'noinclude' / 'onlyinclude' / 'includeonly'))
// A generic attribute that can span multiple lines.
-generic_newline_attribute
+generic_multiline_attribute
= s:space_or_newline*
namePos0:("" { return endOffset(); })
name:generic_attribute_name
namePos:("" { return endOffset(); })
valueData:( space_or_newline*
- v:generic_attribute_newline_value { return v; })?
+ v:generic_attribute_multiline_value { return v; })?
{
var res;
@@ -1322,7 +1322,7 @@
}
// A generic attribute, possibly spanning multiple lines.
-generic_attribute_newline_value
+generic_attribute_multiline_value
= "=" v:generic_att_value? {
return v === null ? [] : v;
}
@@ -1394,7 +1394,7 @@
return lcTn !== "pre" && lcTn !== "hr" &&
constants.HTML.BlockTags.has(tn.toUpperCase());
})
- attribs:generic_newline_attributes
+ attribs:generic_multiline_attributes
space_or_newline*
selfclose:"/"?
">" {
--
To view, visit https://gerrit.wikimedia.org/r/231418
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I04af0338a19c8f56a1003973d741022a25ea0f2d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
