[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Revert "Use a Set for trace/debug/dump flags."
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/398144 ) Change subject: Revert "Use a Set for trace/debug/dump flags." .. Revert "Use a Set for trace/debug/dump flags." Looks like this breaks tracing - can revisit post deploy tomorrow. This reverts commit fff22b4dd951faf3f1d521e46abe1a189633c28f. Change-Id: I4d5a68cbb77e63aeebb951171e28722a195910f0 --- M bin/parserTests.js M lib/html2wt/SelectiveSerializer.js M lib/html2wt/WikitextSerializer.js M lib/logger/ParsoidLogger.js M lib/utils/Util.js M lib/wt2html/DOMPostProcessor.js M lib/wt2html/TokenTransformManager.js M lib/wt2html/pp/processors/computeDSR.js M lib/wt2html/pp/processors/wrapSections.js M lib/wt2html/pp/processors/wrapTemplates.js M lib/wt2html/tokenizer.js M lib/wt2html/tt/TemplateHandler.js 12 files changed, 32 insertions(+), 32 deletions(-) Approvals: jenkins-bot: Verified Arlolra: Looks good to me, approved diff --git a/bin/parserTests.js b/bin/parserTests.js index cab20f8..9fe93e6 100755 --- a/bin/parserTests.js +++ b/bin/parserTests.js @@ -367,7 +367,7 @@ } if (this.env.conf.parsoid.dumpFlags && - this.env.conf.parsoid.dumpFlags.has("dom:post-changes")) { + this.env.conf.parsoid.dumpFlags.indexOf("dom:post-changes") !== -1) { DU.dumpDOM(body, 'Original DOM'); } @@ -382,7 +382,7 @@ } if (this.env.conf.parsoid.dumpFlags && - this.env.conf.parsoid.dumpFlags.has("dom:post-changes")) { + this.env.conf.parsoid.dumpFlags.indexOf("dom:post-changes") !== -1) { console.warn("Change tree : " + JSON.stringify(item.changes)); DU.dumpDOM(body, 'Edited DOM'); } diff --git a/lib/html2wt/SelectiveSerializer.js b/lib/html2wt/SelectiveSerializer.js index 0844c8a..66f286d 100644 --- a/lib/html2wt/SelectiveSerializer.js +++ b/lib/html2wt/SelectiveSerializer.js @@ -30,7 +30,7 @@ // Debug options this.trace = this.env.conf.parsoid.traceFlags && - this.env.conf.parsoid.traceFlags.has("selser"); + (this.env.conf.parsoid.traceFlags.indexOf("selser") !== -1); // Performance Timing option this.metrics = this.env.conf.parsoid.metrics; @@ -97,7 +97,7 @@ p = Promise.resolve(this.env.page.src); } else { if (this.trace || (this.env.conf.parsoid.dumpFlags && - this.env.conf.parsoid.dumpFlags.has('dom:post-dom-diff'))) { + this.env.conf.parsoid.dumpFlags.indexOf('dom:post-dom-diff') !== -1)) { DU.dumpDOM(body, 'DOM after running DOMDiff', { storeDiffMark: true, env: this.env, diff --git a/lib/html2wt/WikitextSerializer.js b/lib/html2wt/WikitextSerializer.js index 0e8ac71..bdaba5e 100644 --- a/lib/html2wt/WikitextSerializer.js +++ b/lib/html2wt/WikitextSerializer.js @@ -1429,7 +1429,7 @@ (new Normalizer(state)).normalizeDOM(body); var psd = this.env.conf.parsoid; - if (psd.dumpFlags && psd.dumpFlags.has("dom:post-normal")) { + if (psd.dumpFlags && (psd.dumpFlags.indexOf("dom:post-normal") !== -1)) { DU.dumpDOM(body, 'DOM: post-normal'); } diff --git a/lib/logger/ParsoidLogger.js b/lib/logger/ParsoidLogger.js index d44690d..63b2db4 100644 --- a/lib/logger/ParsoidLogger.js +++ b/lib/logger/ParsoidLogger.js @@ -90,9 +90,13 @@ // TRACE / DEBUG: Make trace / debug regexp with appropriate postfixes, // depending on the command-line options passed in. function buildTraceOrDebugFlag(parsoidFlags, logType) { - var escapedFlags = Array.from(parsoidFlags).map(Util.escapeRegExp); - var combinedFlag = logType + "\/(" + escapedFlags.join("|") + ")(\\/|$)"; - return new RegExp(combinedFlag); + if (Array.isArray(parsoidFlags)) { + var escapedFlags = parsoidFlags.map(Util.escapeRegExp); + var combinedFlag = logType + "\/(" + escapedFlags.join("|") + ")(\\/|$)"; + return new RegExp(combinedFlag); + } else { + return null; + } } // Register separate backend for tracing / debugging events. diff --git a/lib/utils/Util.js b/lib/utils/Util.js index 0ca4085..f8cbc7e 100644 --- a/lib/utils/Util.js +++ b/lib/utils/Util.js @@ -79,12 +79,8 @@ console.warn("Warning: Generic tracing is no longer supported. Ignoring --trace flag. Please provide handler-specific tracing flags, e.g. '--trace pre,html5', to turn it on."); } else { // Add any new trace
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Revert "Use a Set for trace/debug/dump flags."
Hello C. Scott Ananian, Sbailey, jenkins-bot, Arlolra, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/398144 to review the following change. Change subject: Revert "Use a Set for trace/debug/dump flags." .. Revert "Use a Set for trace/debug/dump flags." Looks like this breaks tracing - can revisit post deploy tomorrow. This reverts commit fff22b4dd951faf3f1d521e46abe1a189633c28f. Change-Id: I4d5a68cbb77e63aeebb951171e28722a195910f0 --- M bin/parserTests.js M lib/html2wt/SelectiveSerializer.js M lib/html2wt/WikitextSerializer.js M lib/logger/ParsoidLogger.js M lib/utils/Util.js M lib/wt2html/DOMPostProcessor.js M lib/wt2html/TokenTransformManager.js M lib/wt2html/pp/processors/computeDSR.js M lib/wt2html/pp/processors/wrapSections.js M lib/wt2html/pp/processors/wrapTemplates.js M lib/wt2html/tokenizer.js M lib/wt2html/tt/TemplateHandler.js 12 files changed, 32 insertions(+), 32 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid refs/changes/44/398144/1 diff --git a/bin/parserTests.js b/bin/parserTests.js index cab20f8..9fe93e6 100755 --- a/bin/parserTests.js +++ b/bin/parserTests.js @@ -367,7 +367,7 @@ } if (this.env.conf.parsoid.dumpFlags && - this.env.conf.parsoid.dumpFlags.has("dom:post-changes")) { + this.env.conf.parsoid.dumpFlags.indexOf("dom:post-changes") !== -1) { DU.dumpDOM(body, 'Original DOM'); } @@ -382,7 +382,7 @@ } if (this.env.conf.parsoid.dumpFlags && - this.env.conf.parsoid.dumpFlags.has("dom:post-changes")) { + this.env.conf.parsoid.dumpFlags.indexOf("dom:post-changes") !== -1) { console.warn("Change tree : " + JSON.stringify(item.changes)); DU.dumpDOM(body, 'Edited DOM'); } diff --git a/lib/html2wt/SelectiveSerializer.js b/lib/html2wt/SelectiveSerializer.js index 0844c8a..66f286d 100644 --- a/lib/html2wt/SelectiveSerializer.js +++ b/lib/html2wt/SelectiveSerializer.js @@ -30,7 +30,7 @@ // Debug options this.trace = this.env.conf.parsoid.traceFlags && - this.env.conf.parsoid.traceFlags.has("selser"); + (this.env.conf.parsoid.traceFlags.indexOf("selser") !== -1); // Performance Timing option this.metrics = this.env.conf.parsoid.metrics; @@ -97,7 +97,7 @@ p = Promise.resolve(this.env.page.src); } else { if (this.trace || (this.env.conf.parsoid.dumpFlags && - this.env.conf.parsoid.dumpFlags.has('dom:post-dom-diff'))) { + this.env.conf.parsoid.dumpFlags.indexOf('dom:post-dom-diff') !== -1)) { DU.dumpDOM(body, 'DOM after running DOMDiff', { storeDiffMark: true, env: this.env, diff --git a/lib/html2wt/WikitextSerializer.js b/lib/html2wt/WikitextSerializer.js index 0e8ac71..bdaba5e 100644 --- a/lib/html2wt/WikitextSerializer.js +++ b/lib/html2wt/WikitextSerializer.js @@ -1429,7 +1429,7 @@ (new Normalizer(state)).normalizeDOM(body); var psd = this.env.conf.parsoid; - if (psd.dumpFlags && psd.dumpFlags.has("dom:post-normal")) { + if (psd.dumpFlags && (psd.dumpFlags.indexOf("dom:post-normal") !== -1)) { DU.dumpDOM(body, 'DOM: post-normal'); } diff --git a/lib/logger/ParsoidLogger.js b/lib/logger/ParsoidLogger.js index d44690d..63b2db4 100644 --- a/lib/logger/ParsoidLogger.js +++ b/lib/logger/ParsoidLogger.js @@ -90,9 +90,13 @@ // TRACE / DEBUG: Make trace / debug regexp with appropriate postfixes, // depending on the command-line options passed in. function buildTraceOrDebugFlag(parsoidFlags, logType) { - var escapedFlags = Array.from(parsoidFlags).map(Util.escapeRegExp); - var combinedFlag = logType + "\/(" + escapedFlags.join("|") + ")(\\/|$)"; - return new RegExp(combinedFlag); + if (Array.isArray(parsoidFlags)) { + var escapedFlags = parsoidFlags.map(Util.escapeRegExp); + var combinedFlag = logType + "\/(" + escapedFlags.join("|") + ")(\\/|$)"; + return new RegExp(combinedFlag); + } else { + return null; + } } // Register separate backend for tracing / debugging events. diff --git a/lib/utils/Util.js b/lib/utils/Util.js index 0ca4085..f8cbc7e 100644 --- a/lib/utils/Util.js +++ b/lib/utils/Util.js @@ -79,12 +79,8 @@ console.warn("Warning: Generic tracing is no longer supported. Ignoring --trace flag. Please provide handler-specific tracing flags, e.g. '--trace pre,html5', to