[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Rename bidir/unidir => twoway/oneway in LC markup.
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370833 )
Change subject: Rename bidir/unidir => twoway/oneway in LC markup.
..
Rename bidir/unidir => twoway/oneway in LC markup.
Depends-On: I7efb35245d48125b167dc0f0ef8f12aa0fff94e5
Change-Id: I44c3a63670e831cd3e69e29d0cc10bba55758082
---
M lib/html2wt/LanguageVariantHandler.js
M lib/wt2html/pegTokenizer.pegjs
M lib/wt2html/tt/LanguageVariantHandler.js
M tests/parserTests.txt
4 files changed, 93 insertions(+), 92 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, but someone else must approve
Arlolra: Looks good to me, approved
diff --git a/lib/html2wt/LanguageVariantHandler.js
b/lib/html2wt/LanguageVariantHandler.js
index 8644926..c9b652b 100644
--- a/lib/html2wt/LanguageVariantHandler.js
+++ b/lib/html2wt/LanguageVariantHandler.js
@@ -38,14 +38,14 @@
}, new Map());
var resultP = Promise.resolve('$E|'); // "error" flag
- // Migration: `twoway` => `bidir` ; `oneway` => `unidir`
- if (dataMWV.twoway) {
- dataMWV.bidir = dataMWV.twoway;
- delete dataMWV.twoway;
+ // Backwards-compatibility: `bidir` => `twoway` ; `unidir` => `oneway`
+ if (dataMWV.bidir) {
+ dataMWV.twoway = dataMWV.bidir;
+ delete dataMWV.bidir;
}
- if (dataMWV.oneway) {
- dataMWV.unidir = dataMWV.oneway;
- delete dataMWV.oneway;
+ if (dataMWV.unidir) {
+ dataMWV.oneway = dataMWV.undir;
+ delete dataMWV.unidir;
}
flags = Object.keys(dataMWV).reduce(function(f, k) {
@@ -162,14 +162,14 @@
}
return combine(sortedFlags(flags), text, false);
});
- } else if (Array.isArray(dataMWV.bidir)) {
- // Bidirectional rules
+ } else if (Array.isArray(dataMWV.twoway)) {
+ // Two-way rules (most common)
if (textSp.length % 3 === 1) {
trailingSemi = textSp[textSp.length - 1];
}
- var b = (dataMWV.bidir[0] && dataMWV.bidir[0].l === '*') ?
- dataMWV.bidir.slice(0, 1) :
- dataMWV.bidir;
+ var b = (dataMWV.twoway[0] && dataMWV.twoway[0].l === '*') ?
+ dataMWV.twoway.slice(0, 1) :
+ dataMWV.twoway;
textP = Promise.all(b.map(function(rule, idx) {
return ser(rule.t, { protect: /;|\}-/
}).then(function(text) {
if (rule.l === '*') {
@@ -187,11 +187,12 @@
maybeDeleteFlag('$S');
return combine(sortedFlags(flags), text, trailingSemi);
});
- } else if (Array.isArray(dataMWV.unidir)) {
+ } else if (Array.isArray(dataMWV.oneway)) {
+ // One-way rules (uncommon)
if (textSp.length % 4 === 1) {
trailingSemi = textSp[textSp.length - 1];
}
- textP = Promise.all(dataMWV.unidir.map(function(rule, idx) {
+ textP = Promise.all(dataMWV.oneway.map(function(rule, idx) {
return Promise.all([
ser(rule.f, { protect: /:|;|=>|\}-/ }),
ser(rule.t, { protect: /;|\}-/ })
diff --git a/lib/wt2html/pegTokenizer.pegjs b/lib/wt2html/pegTokenizer.pegjs
index 476598b..8dad166 100644
--- a/lib/wt2html/pegTokenizer.pegjs
+++ b/lib/wt2html/pegTokenizer.pegjs
@@ -1185,7 +1185,7 @@
lvtext:(lang_variant_nowiki / lang_variant_text_no_semi)
{
return {
-bidir: true,
+twoway: true,
lang: lang,
text: lvtext,
sp: [sp1.join(''), sp2.join(''), sp3.join('')]
@@ -1200,7 +1200,7 @@
to:(lang_variant_nowiki / lang_variant_text_no_semi)
{
return {
-unidir: true,
+oneway: true,
from: from,
lang: lang,
to: to,
diff --git a/lib/wt2html/tt/LanguageVariantHandler.js
b/lib/wt2html/tt/LanguageVariantHandler.js
index 1d5c040..cb9c7fe 100644
--- a/lib/wt2html/tt/LanguageVariantHandler.js
+++ b/lib/wt2html/tt/LanguageVariantHandler.js
@@ -103,10 +103,10 @@
// convert all variant texts to DOM
var isBlock = false;
return Promise.map(dataAttribs.texts, function(t) {
- if (t.bidir) {
+ if (t.twoway) {
return convertOne(t.text).then(function(text) {
isBlock = isBlock || text.isBlock;
- return { lang: t.lang, text: text.xmlstr,
bidir: true, sp: t.sp };
+ return { lang: t.lang, text: text.xmlstr,
twoway: true, sp: t.sp };
});
}
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Rename bidir/unidir => twoway/oneway in LC markup.
C. Scott Ananian has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370833 )
Change subject: Rename bidir/unidir => twoway/oneway in LC markup.
..
Rename bidir/unidir => twoway/oneway in LC markup.
Depends-On: I7efb35245d48125b167dc0f0ef8f12aa0fff94e5
Change-Id: I44c3a63670e831cd3e69e29d0cc10bba55758082
---
M lib/html2wt/LanguageVariantHandler.js
M lib/wt2html/pegTokenizer.pegjs
M lib/wt2html/tt/LanguageVariantHandler.js
M tests/parserTests.txt
4 files changed, 93 insertions(+), 92 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/33/370833/1
diff --git a/lib/html2wt/LanguageVariantHandler.js
b/lib/html2wt/LanguageVariantHandler.js
index 8644926..c9b652b 100644
--- a/lib/html2wt/LanguageVariantHandler.js
+++ b/lib/html2wt/LanguageVariantHandler.js
@@ -38,14 +38,14 @@
}, new Map());
var resultP = Promise.resolve('$E|'); // "error" flag
- // Migration: `twoway` => `bidir` ; `oneway` => `unidir`
- if (dataMWV.twoway) {
- dataMWV.bidir = dataMWV.twoway;
- delete dataMWV.twoway;
+ // Backwards-compatibility: `bidir` => `twoway` ; `unidir` => `oneway`
+ if (dataMWV.bidir) {
+ dataMWV.twoway = dataMWV.bidir;
+ delete dataMWV.bidir;
}
- if (dataMWV.oneway) {
- dataMWV.unidir = dataMWV.oneway;
- delete dataMWV.oneway;
+ if (dataMWV.unidir) {
+ dataMWV.oneway = dataMWV.undir;
+ delete dataMWV.unidir;
}
flags = Object.keys(dataMWV).reduce(function(f, k) {
@@ -162,14 +162,14 @@
}
return combine(sortedFlags(flags), text, false);
});
- } else if (Array.isArray(dataMWV.bidir)) {
- // Bidirectional rules
+ } else if (Array.isArray(dataMWV.twoway)) {
+ // Two-way rules (most common)
if (textSp.length % 3 === 1) {
trailingSemi = textSp[textSp.length - 1];
}
- var b = (dataMWV.bidir[0] && dataMWV.bidir[0].l === '*') ?
- dataMWV.bidir.slice(0, 1) :
- dataMWV.bidir;
+ var b = (dataMWV.twoway[0] && dataMWV.twoway[0].l === '*') ?
+ dataMWV.twoway.slice(0, 1) :
+ dataMWV.twoway;
textP = Promise.all(b.map(function(rule, idx) {
return ser(rule.t, { protect: /;|\}-/
}).then(function(text) {
if (rule.l === '*') {
@@ -187,11 +187,12 @@
maybeDeleteFlag('$S');
return combine(sortedFlags(flags), text, trailingSemi);
});
- } else if (Array.isArray(dataMWV.unidir)) {
+ } else if (Array.isArray(dataMWV.oneway)) {
+ // One-way rules (uncommon)
if (textSp.length % 4 === 1) {
trailingSemi = textSp[textSp.length - 1];
}
- textP = Promise.all(dataMWV.unidir.map(function(rule, idx) {
+ textP = Promise.all(dataMWV.oneway.map(function(rule, idx) {
return Promise.all([
ser(rule.f, { protect: /:|;|=>|\}-/ }),
ser(rule.t, { protect: /;|\}-/ })
diff --git a/lib/wt2html/pegTokenizer.pegjs b/lib/wt2html/pegTokenizer.pegjs
index 476598b..8dad166 100644
--- a/lib/wt2html/pegTokenizer.pegjs
+++ b/lib/wt2html/pegTokenizer.pegjs
@@ -1185,7 +1185,7 @@
lvtext:(lang_variant_nowiki / lang_variant_text_no_semi)
{
return {
-bidir: true,
+twoway: true,
lang: lang,
text: lvtext,
sp: [sp1.join(''), sp2.join(''), sp3.join('')]
@@ -1200,7 +1200,7 @@
to:(lang_variant_nowiki / lang_variant_text_no_semi)
{
return {
-unidir: true,
+oneway: true,
from: from,
lang: lang,
to: to,
diff --git a/lib/wt2html/tt/LanguageVariantHandler.js
b/lib/wt2html/tt/LanguageVariantHandler.js
index 1d5c040..cb9c7fe 100644
--- a/lib/wt2html/tt/LanguageVariantHandler.js
+++ b/lib/wt2html/tt/LanguageVariantHandler.js
@@ -103,10 +103,10 @@
// convert all variant texts to DOM
var isBlock = false;
return Promise.map(dataAttribs.texts, function(t) {
- if (t.bidir) {
+ if (t.twoway) {
return convertOne(t.text).then(function(text) {
isBlock = isBlock || text.isBlock;
- return { lang: t.lang, text: text.xmlstr,
bidir: true, sp: t.sp };
+ return { lang: t.lang, text: text.xmlstr,
twoway: true, sp: t.sp };
});
} else if (t.lang) {
