Issue 6994 - Use shortcut matching for location-only filters

test/filterListener.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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 48 matching lines @@
   callback();
 };
 
 function checkKnownFilters(test, text, expected)
 {
   let result = {};
   for (let type of ["blacklist", "whitelist"])
   {
     let matcher = defaultMatcher["_" + type];
     let filters = [];
-    for (let [keyword, set] of matcher._filterByKeyword)
+    for (let map of [matcher._simpleFiltersByKeyword,
+                     matcher._complexFiltersByKeyword])
     {
-      for (let filter of set)
+      for (let [keyword, set] of map)
       {
-        test.equal(matcher.findKeyword(filter), keyword,
-                   "Keyword of filter " + filter.text);
-        filters.push(filter.text);
+        for (let filter of set)
+        {
+          test.equal(matcher.findKeyword(filter), keyword,
+                     "Keyword of filter " + filter.text);
+          filters.push(filter.text);
+        }
       }
     }
     result[type] = filters;
   }
 
   let elemHide = sandboxedRequire("../lib/elemHide");
   result.elemhide = [];
   for (let filter of elemHide.knownFilters)
     result.elemhide.push(filter.text);
 
@@ skipping 270 matching lines @@
   checkKnownFilters(test, "add special subscription with filter2", {snippets: [filter1.text, filter2.text]});
 
   let subscription4 = Subscription.fromURL("https://easylist-downloads.adblockplus.org/abp-filters-anti-cv.txt");
   subscription4.filters = [filter3];
 
   filterStorage.addSubscription(subscription4);
   checkKnownFilters(test, "add ABP anti-circumvention subscription with filter3", {snippets: [filter1.text, filter2.text, filter3.text]});
 
   test.done();
 };