Enable the no-var linting rule for src/core/{operator_list, pattern}.js
#13094
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
/botio test |
From: Bot.io (Linux m4)ReceivedCommand cmd_test from @timvandermeij received. Current queue size: 0 Live output at: http://54.67.70.0:8877/2c604619c68d60d/output.txt |
From: Bot.io (Windows)ReceivedCommand cmd_test from @timvandermeij received. Current queue size: 0 Live output at: http://3.101.106.178:8877/7a98a490acfd323/output.txt |
From: Bot.io (Linux m4)FailedFull output at http://54.67.70.0:8877/2c604619c68d60d/output.txt Total script time: 24.00 mins
Image differences available at: http://54.67.70.0:8877/2c604619c68d60d/reftest-analyzer.html#web=eq.log |
From: Bot.io (Windows)FailedFull output at http://3.101.106.178:8877/7a98a490acfd323/output.txt Total script time: 28.92 mins
Image differences available at: http://3.101.106.178:8877/7a98a490acfd323/reftest-analyzer.html#web=eq.log |
Snuffleupagus
approved these changes
Mar 13, 2021
This is mostly done using `gulp lint --fix` with a few manual changes in the following diff: ```diff diff --git a/src/core/pattern.js b/src/core/pattern.js index 365491ed3..eedd8b6 100644 --- a/src/core/pattern.js +++ b/src/core/pattern.js @@ -105,7 +105,7 @@ const Pattern = (function PatternClosure() { return Pattern; })(); -var Shadings = {}; +const Shadings = {}; // A small number to offset the first/last color stops so we can insert ones to // support extend. Number.MIN_VALUE is too small and breaks the extend. @@ -597,16 +597,15 @@ Shadings.Mesh = (function MeshClosure() { if (!(0 <= f && f <= 3)) { throw new FormatError("Unknown type6 flag"); } - var i, ii; const pi = coords.length; - for (i = 0, ii = f !== 0 ? 8 : 12; i < ii; i++) { + for (let i = 0, ii = f !== 0 ? 8 : 12; i < ii; i++) { coords.push(reader.readCoordinate()); } const ci = colors.length; - for (i = 0, ii = f !== 0 ? 2 : 4; i < ii; i++) { + for (let i = 0, ii = f !== 0 ? 2 : 4; i < ii; i++) { colors.push(reader.readComponents()); } - var tmp1, tmp2, tmp3, tmp4; + let tmp1, tmp2, tmp3, tmp4; switch (f) { // prettier-ignore case 0: @@ -729,16 +728,15 @@ Shadings.Mesh = (function MeshClosure() { if (!(0 <= f && f <= 3)) { throw new FormatError("Unknown type7 flag"); } - var i, ii; const pi = coords.length; - for (i = 0, ii = f !== 0 ? 12 : 16; i < ii; i++) { + for (let i = 0, ii = f !== 0 ? 12 : 16; i < ii; i++) { coords.push(reader.readCoordinate()); } const ci = colors.length; - for (i = 0, ii = f !== 0 ? 2 : 4; i < ii; i++) { + for (let i = 0, ii = f !== 0 ? 2 : 4; i < ii; i++) { colors.push(reader.readComponents()); } - var tmp1, tmp2, tmp3, tmp4; + let tmp1, tmp2, tmp3, tmp4; switch (f) { // prettier-ignore case 0: @@ -897,7 +895,7 @@ Shadings.Mesh = (function MeshClosure() { decodeType4Shading(this, reader); break; case ShadingType.LATTICE_FORM_MESH: - var verticesPerRow = dict.get("VerticesPerRow") | 0; + const verticesPerRow = dict.get("VerticesPerRow") | 0; if (verticesPerRow < 2) { throw new FormatError("Invalid VerticesPerRow"); } ```
This is mostly done using `gulp lint --fix` with a few manual changes in the following diff: ```diff diff --git a/src/core/operator_list.js b/src/core/operator_list.js index 66c26fe05..cbcd12d 100644 --- a/src/core/operator_list.js +++ b/src/core/operator_list.js @@ -40,7 +40,8 @@ const QueueOptimizer = (function QueueOptimizerClosure() { // 'count' groups of (save, transform, paintImageMaskXObject, restore)+ // have been found at iFirstSave. const iFirstPIMXO = iFirstSave + 2; - for (var i = 0; i < count; i++) { + let i; + for (i = 0; i < count; i++) { const arg = argsArray[iFirstPIMXO + 4 * i]; const imageMask = arg.length === 1 && arg[0]; if ( @@ -106,8 +107,8 @@ const QueueOptimizer = (function QueueOptimizerClosure() { // assuming that heights of those image is too small (~1 pixel) // packing as much as possible by lines let maxX = 0; - let map = [], - maxLineHeight = 0; + const map = []; + let maxLineHeight = 0; let currentX = IMAGE_PADDING, currentY = IMAGE_PADDING; let q; @@ -326,9 +327,9 @@ const QueueOptimizer = (function QueueOptimizerClosure() { if (fnArray[i] !== OPS.transform) { return false; } - var iFirstTransform = context.iCurr - 2; - var firstTransformArg0 = argsArray[iFirstTransform][0]; - var firstTransformArg3 = argsArray[iFirstTransform][3]; + const iFirstTransform = context.iCurr - 2; + const firstTransformArg0 = argsArray[iFirstTransform][0]; + const firstTransformArg3 = argsArray[iFirstTransform][3]; if ( argsArray[i][0] !== firstTransformArg0 || argsArray[i][1] !== 0 || @@ -342,8 +343,8 @@ const QueueOptimizer = (function QueueOptimizerClosure() { if (fnArray[i] !== OPS.paintImageXObject) { return false; } - var iFirstPIXO = context.iCurr - 1; - var firstPIXOArg0 = argsArray[iFirstPIXO][0]; + const iFirstPIXO = context.iCurr - 1; + const firstPIXOArg0 = argsArray[iFirstPIXO][0]; if (argsArray[i][0] !== firstPIXOArg0) { return false; // images don't match } @@ -423,9 +424,9 @@ const QueueOptimizer = (function QueueOptimizerClosure() { if (fnArray[i] !== OPS.showText) { return false; } - var iFirstSetFont = context.iCurr - 3; - var firstSetFontArg0 = argsArray[iFirstSetFont][0]; - var firstSetFontArg1 = argsArray[iFirstSetFont][1]; + const iFirstSetFont = context.iCurr - 3; + const firstSetFontArg0 = argsArray[iFirstSetFont][0]; + const firstSetFontArg1 = argsArray[iFirstSetFont][1]; if ( argsArray[i][0] !== firstSetFontArg0 || argsArray[i][1] !== firstSetFontArg1 ```
timvandermeij
force-pushed
the
no-var-src
branch
from
3e3f41b to
a2f0573
Compare
|
/botio unittest |
From: Bot.io (Linux m4)ReceivedCommand cmd_unittest from @timvandermeij received. Current queue size: 1 Live output at: http://54.67.70.0:8877/c5c3f22f22d638c/output.txt |
From: Bot.io (Windows)ReceivedCommand cmd_unittest from @timvandermeij received. Current queue size: 1 Live output at: http://3.101.106.178:8877/737278ea14f3515/output.txt |
From: Bot.io (Linux m4)SuccessFull output at http://54.67.70.0:8877/c5c3f22f22d638c/output.txt Total script time: 3.55 mins
|
From: Bot.io (Windows)SuccessFull output at http://3.101.106.178:8877/737278ea14f3515/output.txt Total script time: 5.10 mins
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The commit messages contain more information about the individual commits.