[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: linter: Don't provide 'src'
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/325731 )
Change subject: linter: Don't provide 'src'
..
linter: Don't provide 'src'
This isn't used by the Linter extension, so there's no need to increase
the request size by including it.
Change-Id: I9bbd5b743a9ef5146f03d9ea159387f822eda937
---
M lib/logger/linter.js
M lib/wt2html/pp/handlers/linter.js
M tests/mocha/linter.js
3 files changed, 5 insertions(+), 38 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/logger/linter.js b/lib/logger/linter.js
index dd8d74b..5e35a06 100644
--- a/lib/logger/linter.js
+++ b/lib/logger/linter.js
@@ -70,15 +70,6 @@
msg.templateInfo = lintObj.templateInfo;
}
- var src = lintObj.src;
- if (msg.type === 'fostered' ||
- msg.type === 'multi-template' ||
- msg.type === 'mixed-content') {
- msg.src = src;
- } else if (dsr) {
- msg.src = src.substring(dsr[0], dsr[1]);
- }
-
this.buffer.push(msg);
} catch (e) {
this._env.log("error/linter", "Error in linterBackend: " + e);
diff --git a/lib/wt2html/pp/handlers/linter.js
b/lib/wt2html/pp/handlers/linter.js
index d7ca19a..05973c3 100644
--- a/lib/wt2html/pp/handlers/linter.js
+++ b/lib/wt2html/pp/handlers/linter.js
@@ -34,7 +34,7 @@
var parts = dmw.parts;
var lintObj;
if (typeof parts[0] === 'string' || typeof
parts[parts.length - 1] === 'string') {
- lintObj = {src: env.page.src, dsr: dsr };
+ lintObj = { dsr: dsr };
env.log('lint/mixed-content', lintObj);
} else if (parts.length > 1) {
var targets = [];
@@ -44,7 +44,7 @@
}
});
if (targets.length > 1) {
- lintObj = { src: targets, dsr: dsr };
+ lintObj = { dsr: dsr };
env.log('lint/multi-template', lintObj);
}
}
@@ -76,7 +76,7 @@
if (DU.hasNodeName(c, 'meta')) {
var type = c.getAttribute('typeof');
if (type === 'mw:Placeholder/StrippedTag') {
- lintObj = { src: env.page.src, dsr: dsr, templateInfo:
templateInfo };
+ lintObj = { dsr: dsr, templateInfo: templateInfo };
env.log('lint/stripped-tag', lintObj);
}
}
@@ -98,7 +98,6 @@
if (dp.selfClose && cNodeName !== 'meta') {
lintObj = {
- src: env.page.src,
dsr: dsr,
templateInfo: templateInfo,
params: { name: cNodeName },
@@ -110,7 +109,6 @@
if (dp.autoInsertedEnd === true && (tplInfo || dsr[2] > 0)) {
lintObj = {
- src: env.page.src,
dsr: dsr,
templateInfo: templateInfo,
params: { name: cNodeName },
@@ -120,7 +118,6 @@
if (dp.autoInsertedStart === true && (tplInfo || dsr[3] > 0)) {
lintObj = {
- src: env.page.src,
dsr: dsr,
templateInfo: templateInfo,
};
@@ -169,7 +166,7 @@
} else {
dsr =
dp.dsr;
}
- var lintObj = {
src: env.page.src, dsr: dsr, templateInfo: templateInfo };
+ var lintObj = {
dsr: dsr, templateInfo: templateInfo };
env.log('lint/ignored-table-attr', lintObj);
}
}
@@ -195,10 +192,8 @@
* Here 'foo' gets fostered out.
*/
function logFosteredContent(env, node, dp, tplInfo) {
- var fosteredSRC = node.innerHTML;
var nextSibling = node.nextSibling;
while (nextSibling && !DU.hasNodeName(nextSibling, 'table')) {
- fosteredSRC
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: linter: Don't provide 'src'
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/325731
Change subject: linter: Don't provide 'src'
..
linter: Don't provide 'src'
This isn't used by the Linter extension, so there's no need to increase
the request size by including it.
Change-Id: I9bbd5b743a9ef5146f03d9ea159387f822eda937
---
M lib/logger/linter.js
M lib/wt2html/pp/handlers/linter.js
M tests/mocha/lintertest.js
3 files changed, 5 insertions(+), 35 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/31/325731/1
diff --git a/lib/logger/linter.js b/lib/logger/linter.js
index a594df9..e525717 100644
--- a/lib/logger/linter.js
+++ b/lib/logger/linter.js
@@ -68,7 +68,6 @@
try {
var logType = logData.logType;
var lintObj = logData.logObject[0];
- var src = lintObj.src;
var dsr = lintObj.dsr;
var templateInfo = lintObj.templateInfo;
var msg = {};
@@ -91,11 +90,6 @@
if (templateInfo) {
msg.templateInfo = templateInfo;
- }
- if (logType === 'lint/fostered' || logType ===
'lint/multi-template' || logType === 'lint/mixed-content') {
- msg.src = src;
- } else if (dsr) {
- msg.src = src.substring(dsr[0], dsr[1]);
}
this.buffer.push(msg);
diff --git a/lib/wt2html/pp/handlers/linter.js
b/lib/wt2html/pp/handlers/linter.js
index e5cf66d..82bab74 100644
--- a/lib/wt2html/pp/handlers/linter.js
+++ b/lib/wt2html/pp/handlers/linter.js
@@ -35,7 +35,7 @@
var parts = dmw.parts;
var lintObj;
if (typeof parts[0] === 'string' || typeof
parts[parts.length - 1] === 'string') {
- lintObj = {src: env.page.src, dsr: dsr };
+ lintObj = { dsr: dsr };
env.log('lint/mixed-content', lintObj);
} else if (parts.length > 1) {
var targets = [];
@@ -45,7 +45,7 @@
}
});
if (targets.length > 1) {
- lintObj = { src: targets, dsr: dsr };
+ lintObj = { dsr: dsr };
env.log('lint/multi-template', lintObj);
}
}
@@ -77,7 +77,7 @@
if (DU.hasNodeName(c, 'meta')) {
var type = c.getAttribute('typeof');
if (type === 'mw:Placeholder/StrippedTag') {
- lintObj = { src: env.page.src, dsr: dsr, templateInfo:
templateInfo };
+ lintObj = { dsr: dsr, templateInfo: templateInfo };
env.log('lint/stripped-tag', lintObj);
}
}
@@ -93,7 +93,6 @@
if (dp.selfClose) {
lintObj = {
- src: env.page.src,
dsr: dsr,
templateInfo: templateInfo,
params: { name: cNodeName },
@@ -105,7 +104,6 @@
if (dp.autoInsertedEnd === true && (tplInfo || dsr[2] > 0)) {
lintObj = {
- src: env.page.src,
dsr: dsr,
templateInfo: templateInfo,
params: { name: cNodeName },
@@ -115,7 +113,6 @@
if (dp.autoInsertedStart === true && (tplInfo || dsr[3] > 0)) {
lintObj = {
- src: env.page.src,
dsr: dsr,
templateInfo: templateInfo,
};
@@ -164,7 +161,7 @@
} else {
dsr =
dp.dsr;
}
- var lintObj = {
src: env.page.src, dsr: dsr, templateInfo: templateInfo };
+ var lintObj = {
dsr: dsr, templateInfo: templateInfo };
env.log('lint/ignored-table-attr', lintObj);
}
}
@@ -190,10 +187,8 @@
* Here 'foo' gets fostered out.
*/
function logFosteredContent(env, node, dp, tplInfo) {
- var fosteredSRC = node.innerHTML;
var nextSibling =
