From f4794a2bfb2d51007c64790b290613f3351dbaa6 Mon Sep 17 00:00:00 2001 From: reimu Date: Thu, 6 Dec 2018 20:30:32 +0000 Subject: [PATCH] Bug 1501931 - Enable ESLint for parser/ (manual fixes) r=Standard8,mrbkap Depends on D11920 Differential Revision: https://phabricator.services.mozilla.com/D11921 --HG-- extra : moz-landing-system : lando --- .eslintignore | 1 - .../tests/mochitest/file_bug688580.js | 1 + .../tests/mochitest/file_defer_bug1104732.js | 1 + .../mochitest/file_img_picture_preload.html | 4 +-- .../tests/mochitest/parser_datreader.js | 8 +++--- .../tests/mochitest/parser_web_testrunner.js | 6 ++++- .../tests/mochitest/test_bug339350.xhtml | 25 ++++++++++--------- .../tests/mochitest/test_bug396568.html | 3 ++- .../tests/mochitest/test_bug460437.xhtml | 1 + .../tests/mochitest/test_bug566879.html | 3 +++ .../tests/mochitest/test_bug715739.html | 5 ++-- .../tests/mochitest/test_compatmode.html | 2 +- parser/xml/test/unit/test_parser.js | 2 -- parser/xml/test/unit/test_sanitizer.js | 1 + 14 files changed, 37 insertions(+), 26 deletions(-) diff --git a/.eslintignore b/.eslintignore index 2f468c9199b7..0a641b64e28c 100644 --- a/.eslintignore +++ b/.eslintignore @@ -31,7 +31,6 @@ netwerk/cookie/test/browser/** netwerk/test/browser/** netwerk/test/mochitests/** netwerk/test/unit*/** -parser/** tools/update-packaging/** uriloader/exthandler/** uriloader/exthandler/tests/mochitest/** diff --git a/parser/htmlparser/tests/mochitest/file_bug688580.js b/parser/htmlparser/tests/mochitest/file_bug688580.js index b567150f6739..e3319caba0de 100644 --- a/parser/htmlparser/tests/mochitest/file_bug688580.js +++ b/parser/htmlparser/tests/mochitest/file_bug688580.js @@ -1,3 +1,4 @@ +/* globals state:true */ is(document.readyState, "interactive", "readyState should be interactive during defer."); is(state, "readyState interactive", "Bad state upon defer"); state = "defer"; diff --git a/parser/htmlparser/tests/mochitest/file_defer_bug1104732.js b/parser/htmlparser/tests/mochitest/file_defer_bug1104732.js index a1bba50cdfc6..7ba406c8bd9c 100644 --- a/parser/htmlparser/tests/mochitest/file_defer_bug1104732.js +++ b/parser/htmlparser/tests/mochitest/file_defer_bug1104732.js @@ -1,3 +1,4 @@ +/* globals state:true */ is(document.readyState, "interactive", "readyState should be interactive during defer."); state = "defer"; diff --git a/parser/htmlparser/tests/mochitest/file_img_picture_preload.html b/parser/htmlparser/tests/mochitest/file_img_picture_preload.html index d64547ce3fee..a5a55a56a3e3 100644 --- a/parser/htmlparser/tests/mochitest/file_img_picture_preload.html +++ b/parser/htmlparser/tests/mochitest/file_img_picture_preload.html @@ -43,7 +43,7 @@ request.send(null); is(request.status, 200, "Getting status from sjs helper should succeed"); if (request.status === 200) { - var preloadedImages = JSON.parse(request.responseText); + preloadedImages = JSON.parse(request.responseText); } } @@ -146,7 +146,7 @@ for (var img of images) { var imgName = img.id; if (img.currentSrc) { - var split = img.currentSrc.split("?")[1].split(":"); + split = img.currentSrc.split("?")[1].split(":"); is(split[0], imgName, "image " + imgName + " source matches element id"); is(split[1], preloadByName[imgName], diff --git a/parser/htmlparser/tests/mochitest/parser_datreader.js b/parser/htmlparser/tests/mochitest/parser_datreader.js index 85225cf21008..5f610fcc80c3 100644 --- a/parser/htmlparser/tests/mochitest/parser_datreader.js +++ b/parser/htmlparser/tests/mochitest/parser_datreader.js @@ -36,7 +36,7 @@ function parseTestcase(testcase) { var lines = testcase.split("\n"); /* check that the first non-empty, non-comment line is #data */ - for (var line of lines) { + for (let line of lines) { if (!line || startsWith(line, "##")) { continue; } @@ -51,7 +51,7 @@ function parseTestcase(testcase) { var errors = []; var fragment = []; var currentList = input; - for (var line of lines) { + for (let line of lines) { if (startsWith(line, "##todo")) { todo(false, line.substring(6)); continue; @@ -146,7 +146,7 @@ function addLevels(walker, buf, indent) { if (walker.currentNode.hasAttributes()) { var valuesByName = {}; var attrs = walker.currentNode.attributes; - for (var i = 0; i < attrs.length; ++i) { + for (let i = 0; i < attrs.length; ++i) { var localName = attrs[i].localName; var name; var attrNs = attrs[i].namespaceURI; @@ -164,7 +164,7 @@ function addLevels(walker, buf, indent) { valuesByName[name] = attrs[i].value; } var keys = Object.keys(valuesByName).sort(); - for (var i = 0; i < keys.length; ++i) { + for (let i = 0; i < keys.length; ++i) { buf += "\n" + indent + " " + keys[i] + "=\"" + valuesByName[keys[i]] + "\""; } diff --git a/parser/htmlparser/tests/mochitest/parser_web_testrunner.js b/parser/htmlparser/tests/mochitest/parser_web_testrunner.js index 08a66d098d3c..6fc2d0934a14 100644 --- a/parser/htmlparser/tests/mochitest/parser_web_testrunner.js +++ b/parser/htmlparser/tests/mochitest/parser_web_testrunner.js @@ -15,6 +15,10 @@ * an iframe with id "testframe". */ +/* import-globals-from ./parser_datreader.js */ +/* import-globals-from ./html5_tree_construction_exceptions.js */ +/* globals parserDatFiles */ + var functionsToRunAsync = []; window.addEventListener("message", function(event) { @@ -87,6 +91,7 @@ function makeFragmentTestChecker(input, context = document.createElementNS("http://www.w3.org/1999/xhtml", fragment); } + // eslint-disable-next-line no-unsanitized/property context.innerHTML = input; var domAsString = fragmentToTestOutput(context); is(domAsString, expected, "HTML5 expected success. " + new Date()); @@ -99,7 +104,6 @@ function makeFragmentTestChecker(input, var testcases; function nextTest(testframe) { - var test = 0; var {done, value} = testcases.next(); if (done) { SimpleTest.finish(); diff --git a/parser/htmlparser/tests/mochitest/test_bug339350.xhtml b/parser/htmlparser/tests/mochitest/test_bug339350.xhtml index e443858d0c68..ae383aa52b85 100644 --- a/parser/htmlparser/tests/mochitest/test_bug339350.xhtml +++ b/parser/htmlparser/tests/mochitest/test_bug339350.xhtml @@ -37,22 +37,23 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=339350
 
 
diff --git a/parser/htmlparser/tests/mochitest/test_bug396568.html b/parser/htmlparser/tests/mochitest/test_bug396568.html index 6a9a9f0e7d4d..b0d6e7e21d7a 100644 --- a/parser/htmlparser/tests/mochitest/test_bug396568.html +++ b/parser/htmlparser/tests/mochitest/test_bug396568.html @@ -33,10 +33,11 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=396568 var reached = false; try { + // eslint-disable-next-line no-undef noSuchIdentifier; reached = true; } catch (e) { - is(e.lineNumber, 36, "Unexpected line number"); // this line number is dependent on the line number of noSuchIdentifier + is(e.lineNumber, 37, "Unexpected line number"); // this line number is dependent on the line number of noSuchIdentifier } is(reached, false, "Exception needed to be thrown"); diff --git a/parser/htmlparser/tests/mochitest/test_bug460437.xhtml b/parser/htmlparser/tests/mochitest/test_bug460437.xhtml index 73ec382af8bd..baedd46ce180 100644 --- a/parser/htmlparser/tests/mochitest/test_bug460437.xhtml +++ b/parser/htmlparser/tests/mochitest/test_bug460437.xhtml @@ -15,6 +15,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=460437