Issue 4878 - Start using ESLint for adblockpluscore

test/regexpFilters_matching.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 16 matching lines @@
   let sandboxedRequire = createSandbox();
   (
     {Filter, RegExpFilter} = sandboxedRequire("../lib/filterClasses")
   );
 
   callback();
 };
 
 
 
-function testMatchInternal(test, text, location, contentType, docDomain, thirdParty, sitekey, expected)
-{
-  let filter = Filter.fromText(text);
-  let result = filter.matches(location, RegExpFilter.typeMap[contentType], docDomain, thirdParty, sitekey);
-  test.equal(!!result, expected, '"' + text + '".matches(' + location + ", " + contentType + ", " + docDomain + ", " + (thirdParty ? "third-party" : "first-party") + ", " + (sitekey || "no-sitekey") + ")");
-}

[Wladimir Palant, 2017/03/02 14:07:08]

Why move an internal function outside the function that is using it?

[kzar, 2017/03/08 12:33:56]

I did this since we were violating no-shadow for the parameters. But thinking
about it we can simply not pass (most of) them instead.

-
 function testMatch(test, text, location, contentType, docDomain, thirdParty, sitekey, expected)
 {
-  testMatchInternal(test, text, location, contentType, docDomain, thirdParty, sitekey, expected);
+  function testMatchInternal(filterText)
+  {
+    let filter = Filter.fromText(filterText);
+    let result = filter.matches(location, RegExpFilter.typeMap[contentType], docDomain, thirdParty, sitekey);
+    test.equal(!!result, expected, '"' + filterText + '".matches(' + location + ", " + contentType + ", " + docDomain + ", " + (thirdParty ? "third-party" : "first-party") + ", " + (sitekey || "no-sitekey") + ")");
+  }
+
+  testMatchInternal(text);
   if (!/^@@/.test(text))
-    testMatchInternal(test, "@@" + text, location, contentType, docDomain, thirdParty, sitekey, expected);
+    testMatchInternal("@@" + text);
 }
 
 exports.testBasicFilters = function(test)
 {
   testMatch(test, "abc", "http://abc/adf", "IMAGE", null, false, null, true);
   testMatch(test, "abc", "http://ABC/adf", "IMAGE", null, false, null, true);
   testMatch(test, "abc", "http://abd/adf", "IMAGE", null, false, null, false);
   testMatch(test, "|abc", "http://abc/adf", "IMAGE", null, false, null, false);
   testMatch(test, "|http://abc", "http://abc/adf", "IMAGE", null, false, null, true);
   testMatch(test, "abc|", "http://abc/adf", "IMAGE", null, false, null, false);
@@ skipping 296 matching lines @@
   testMatch(test, "@@test$document,~image", "http://test/", "DOCUMENT", null, false, null, true);
   testMatch(test, "@@test$document,domain=foo.com", "http://test/", "DOCUMENT", "foo.com", false, null, true);
   testMatch(test, "@@test$document,domain=foo.com", "http://test/", "DOCUMENT", "bar.com", false, null, false);
   testMatch(test, "@@test$document,domain=~foo.com", "http://test/", "DOCUMENT", "foo.com", false, null, false);
   testMatch(test, "@@test$document,domain=~foo.com", "http://test/", "DOCUMENT", "bar.com", false, null, true);
   testMatch(test, "@@test$document,sitekey=foo-publickey", "http://test/", "DOCUMENT", "foo.com", false, "foo-publickey", true);
   testMatch(test, "@@test$document,sitekey=foo-publickey", "http://test/", "DOCUMENT", "foo.com", false, null, false);
 
   test.done();
 };