Issue 4878 - Start using ESLint for adblockpluscore

test/filterClasses.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 43 matching lines @@
 {
   // Filter serialization only writes out essential properties, need to do a full serialization here
   let result = [];
   result.push("text=" + filter.text);
   if (filter instanceof InvalidFilter)
   {
     result.push("type=invalid");
     result.push("reason=" + filter.reason);
   }
   else if (filter instanceof CommentFilter)
-  {
     result.push("type=comment");
-  }
   else if (filter instanceof ActiveFilter)
   {
     result.push("disabled=" + filter.disabled);
     result.push("lastHit=" + filter.lastHit);
     result.push("hitCount=" + filter.hitCount);
 
     let domains = [];
     if (filter.domains)
     {
       for (let domain in filter.domains)
+      {
         if (domain != "")
           domains.push(filter.domains[domain] ? domain : "~" + domain);
+      }
     }
     result.push("domains=" + domains.sort().join("|"));
 
     if (filter instanceof RegExpFilter)
     {
       result.push("regexp=" + filter.regexp.source);
       result.push("contentType=" + filter.contentType);
       result.push("matchCase=" + filter.matchCase);
 
       let sitekeys = filter.sitekeys || [];
       result.push("sitekeys=" + sitekeys.slice().sort().join("|"));
 
       result.push("thirdParty=" + filter.thirdParty);
       if (filter instanceof BlockingFilter)
       {
         result.push("type=filterlist");
         result.push("collapse=" + filter.collapse);
       }
       else if (filter instanceof WhitelistFilter)
-      {
         result.push("type=whitelist");
-      }
     }
     else if (filter instanceof ElemHideBase)
     {
       if (filter instanceof ElemHideFilter)
         result.push("type=elemhide");
       else if (filter instanceof ElemHideException)
         result.push("type=elemhideexception");
       else if (filter instanceof ElemHideEmulationFilter)
         result.push("type=elemhideemulation");
 
@@ skipping 35 matching lines @@
       RegExpFilter.typeMap.DOCUMENT | RegExpFilter.typeMap.ELEMHIDE |
       RegExpFilter.typeMap.POPUP | RegExpFilter.typeMap.GENERICHIDE |
       RegExpFilter.typeMap.GENERICBLOCK
     ));
     addProperty("matchCase", "false");
     addProperty("thirdParty", "null");
     addProperty("domains", "");
     addProperty("sitekeys", "");
   }
   if (type == "filterlist")
-  {
     addProperty("collapse", "null");
-  }
   if (type == "elemhide" || type == "elemhideexception" ||
       type == "elemhideemulation")
   {
     addProperty("selectorDomain", "");
     addProperty("domains", "");
   }
 }
 
 function compareFilter(test, text, expected, postInit)
 {
   addDefaults(expected);
 
   let filter = Filter.fromText(text);
   if (postInit)
-    postInit(filter)
+    postInit(filter);
   let result = serializeFilter(filter);
   test.equal(result.sort().join("\n"), expected.sort().join("\n"), text);
 
   // Test round-trip
   let filter2;
   let buffer = [];
   filter.serialize(buffer);
   if (buffer.length)
   {
     let map = Object.create(null);
     for (let line of buffer.slice(1))
     {
       if (/(.*?)=(.*)/.test(line))
         map[RegExp.$1] = RegExp.$2;
     }
     filter2 = Filter.fromObject(map);
   }
   else
-  {
     filter2 = Filter.fromText(filter.text);
-  }
 
   test.equal(serializeFilter(filter).join("\n"), serializeFilter(filter2).join("\n"), text + " deserialization");
 }
 
 exports.testFilterClassDefinitions = function(test)
 {
   test.equal(typeof Filter, "function", "typeof Filter");
   test.equal(typeof InvalidFilter, "function", "typeof InvalidFilter");
   test.equal(typeof CommentFilter, "function", "typeof CommentFilter");
   test.equal(typeof ActiveFilter, "function", "typeof ActiveFilter");
@@ skipping 21 matching lines @@
 exports.testInvalidFilters = function(test)
 {
   compareFilter(test, "/??/", ["type=invalid", "text=/??/", "reason=filter_invalid_regexp"]);
   compareFilter(test, "asd$foobar", ["type=invalid", "text=asd$foobar", "reason=filter_unknown_option"]);
   compareFilter(test, "#dd(asd)(ddd)", ["type=invalid", "text=#dd(asd)(ddd)", "reason=filter_elemhide_duplicate_id"]);
   compareFilter(test, "#*", ["type=invalid", "text=#*", "reason=filter_elemhide_nocriteria"]);
 
   function checkElemHideEmulationFilterInvalid(domains)
   {
     let filterText = domains + "##[-abp-properties='abc']";
-    compareFilter(test, filterText,
-                  ["type=invalid", "text=" + filterText,
-                   "reason=filter_elemhideemulation_nodomain"]);
+    compareFilter(
+      test, filterText, [
+        "type=invalid", "text=" + filterText,
+        "reason=filter_elemhideemulation_nodomain"
+      ]
+    );
   }
   checkElemHideEmulationFilterInvalid("");
   checkElemHideEmulationFilterInvalid("~foo.com");
   checkElemHideEmulationFilterInvalid("~foo.com,~bar.com");
   checkElemHideEmulationFilterInvalid("foo");
   checkElemHideEmulationFilterInvalid("~foo.com,bar");
 
   test.done();
 };
 
-exports.testFiltersWithState  = function(test)
+exports.testFiltersWithState = function(test)
 {
   compareFilter(test, "blabla", ["type=filterlist", "text=blabla", "regexp=blabla"]);
-  compareFilter(test, "blabla_default", ["type=filterlist", "text=blabla_default", "regexp=blabla_default"], function(filter)
-  {
-    filter.disabled = false;
-    filter.hitCount = 0;
-    filter.lastHit = 0;
-  });
-  compareFilter(test, "blabla_non_default", ["type=filterlist", "text=blabla_non_default", "regexp=blabla_non_default", "disabled=true", "hitCount=12", "lastHit=20"], function(filter)
-  {
-    filter.disabled = true;
-    filter.hitCount = 12;
-    filter.lastHit = 20;
-  });
+  compareFilter(
+    test, "blabla_default", ["type=filterlist", "text=blabla_default", "regexp=blabla_default"],
+    filter =>
+    {
+      filter.disabled = false;
+      filter.hitCount = 0;
+      filter.lastHit = 0;
+    }
+  );
+  compareFilter(
+    test, "blabla_non_default",
+    ["type=filterlist", "text=blabla_non_default", "regexp=blabla_non_default", "disabled=true", "hitCount=12", "lastHit=20"],
+    filter =>
+    {
+      filter.disabled = true;
+      filter.hitCount = 12;
+      filter.lastHit = 20;
+    }
+  );
 
   test.done();
 };
 
 exports.testSpecialCharacters = function(test)
 {
   compareFilter(test, "/ddd|f?a[s]d/", ["type=filterlist", "text=/ddd|f?a[s]d/", "regexp=ddd|f?a[s]d"]);
   compareFilter(test, "*asdf*d**dd*", ["type=filterlist", "text=*asdf*d**dd*", "regexp=asdf.*d.*dd"]);
   compareFilter(test, "|*asd|f*d**dd*|", ["type=filterlist", "text=|*asd|f*d**dd*|", "regexp=^.*asd\\|f.*d.*dd.*$"]);
   compareFilter(test, "dd[]{}$%<>&()d", ["type=filterlist", "text=dd[]{}$%<>&()d", "regexp=dd\\[\\]\\{\\}\\$\\%\\<\\>\\&\\(\\)d"]);
@@ skipping 14 matching lines @@
 
   // background and image should be the same for backwards compatibility
   compareFilter(test, "bla$image", ["type=filterlist", "text=bla$image", "regexp=bla", "contentType=" + (t.IMAGE)]);
   compareFilter(test, "bla$background", ["type=filterlist", "text=bla$background", "regexp=bla", "contentType=" + (t.IMAGE)]);
   compareFilter(test, "bla$~image", ["type=filterlist", "text=bla$~image", "regexp=bla", "contentType=" + (defaultTypes & ~t.IMAGE)]);
   compareFilter(test, "bla$~background", ["type=filterlist", "text=bla$~background", "regexp=bla", "contentType=" + (defaultTypes & ~t.IMAGE)]);
 
   compareFilter(test, "@@bla$~script,~other", ["type=whitelist", "text=@@bla$~script,~other", "regexp=bla", "contentType=" + (defaultTypes & ~(t.SCRIPT | t.OTHER))]);
   compareFilter(test, "@@http://bla$~script,~other", ["type=whitelist", "text=@@http://bla$~script,~other", "regexp=http\\:\\/\\/bla", "contentType=" + (defaultTypes & ~(t.SCRIPT | t.OTHER))]);
   compareFilter(test, "@@|ftp://bla$~script,~other", ["type=whitelist", "text=@@|ftp://bla$~script,~other", "regexp=^ftp\\:\\/\\/bla", "contentType=" + (defaultTypes & ~(t.SCRIPT | t.OTHER))]);
-  compareFilter(test, "@@bla$~script,~other,document", ["type=whitelist", "text=@@bla$~script,~other,document", "regexp=bla", "contentType=" +  (defaultTypes & ~(t.SCRIPT | t.OTHER) | t.DOCUMENT)]);
+  compareFilter(test, "@@bla$~script,~other,document", ["type=whitelist", "text=@@bla$~script,~other,document", "regexp=bla", "contentType=" + (defaultTypes & ~(t.SCRIPT | t.OTHER) | t.DOCUMENT)]);
   compareFilter(test, "@@bla$~script,~other,~document", ["type=whitelist", "text=@@bla$~script,~other,~document", "regexp=bla", "contentType=" + (defaultTypes & ~(t.SCRIPT | t.OTHER))]);
   compareFilter(test, "@@bla$document", ["type=whitelist", "text=@@bla$document", "regexp=bla", "contentType=" + t.DOCUMENT]);
-  compareFilter(test, "@@bla$~script,~other,elemhide", ["type=whitelist", "text=@@bla$~script,~other,elemhide", "regexp=bla", "contentType=" +  (defaultTypes & ~(t.SCRIPT | t.OTHER) | t.ELEMHIDE)]);
+  compareFilter(test, "@@bla$~script,~other,elemhide", ["type=whitelist", "text=@@bla$~script,~other,elemhide", "regexp=bla", "contentType=" + (defaultTypes & ~(t.SCRIPT | t.OTHER) | t.ELEMHIDE)]);
   compareFilter(test, "@@bla$~script,~other,~elemhide", ["type=whitelist", "text=@@bla$~script,~other,~elemhide", "regexp=bla", "contentType=" + (defaultTypes & ~(t.SCRIPT | t.OTHER))]);
   compareFilter(test, "@@bla$elemhide", ["type=whitelist", "text=@@bla$elemhide", "regexp=bla", "contentType=" + t.ELEMHIDE]);
 
   compareFilter(test, "@@bla$~script,~other,donottrack", ["type=invalid", "text=@@bla$~script,~other,donottrack", "reason=filter_unknown_option"]);
   compareFilter(test, "@@bla$~script,~other,~donottrack", ["type=invalid", "text=@@bla$~script,~other,~donottrack", "reason=filter_unknown_option"]);
   compareFilter(test, "@@bla$donottrack", ["type=invalid", "text=@@bla$donottrack", "reason=filter_unknown_option"]);
   compareFilter(test, "@@bla$foobar", ["type=invalid", "text=@@bla$foobar", "reason=filter_unknown_option"]);
   compareFilter(test, "@@bla$image,foobar", ["type=invalid", "text=@@bla$image,foobar", "reason=filter_unknown_option"]);
   compareFilter(test, "@@bla$foobar,image", ["type=invalid", "text=@@bla$foobar,image", "reason=filter_unknown_option"]);
 
@@ skipping 63 matching lines @@
     let filter = Filter.fromText(filterText);
     test.ok(filter instanceof InvalidFilter);
     test.equal(filter.reason, "filter_invalid_domain");
   }
 
   test.done();
 };
 
 exports.testElemHideRulesWithBraces = function(test)
 {
-  compareFilter(test, "###foo{color: red}",
-                ["type=elemhide",
-                 "text=###foo{color: red}",
-                 "selectorDomain=",
-                 "selector=#foo\\x7B color: red\\x7D ",
-                 "domains="]);
-  compareFilter(test, "foo.com##[-abp-properties='/margin: [3-4]{2}/']",
-                ["type=elemhideemulation",
-                 "text=foo.com##[-abp-properties='/margin: [3-4]{2}/']",
-                 "selectorDomain=foo.com",
-                 "selector=[-abp-properties='/margin: [3-4]\\x7B 2\\x7D /']",
-                 "domains=FOO.COM"]);
+  compareFilter(
+    test, "###foo{color: red}", [
+      "type=elemhide",
+      "text=###foo{color: red}",
+      "selectorDomain=",
+      "selector=#foo\\x7B color: red\\x7D ",
+      "domains="
+    ]
+  );
+  compareFilter(
+    test, "foo.com##[-abp-properties='/margin: [3-4]{2}/']", [
+      "type=elemhideemulation",
+      "text=foo.com##[-abp-properties='/margin: [3-4]{2}/']",
+      "selectorDomain=foo.com",
+      "selector=[-abp-properties='/margin: [3-4]\\x7B 2\\x7D /']",
+      "domains=FOO.COM"
+    ]
+  );
   test.done();
 };