Issue 6665 - Split out element hiding exceptions into their own module

lib/elemHide.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 37 matching lines @@
 
 /**
  * Map to be used instead when a filter has a blank domains property.
  * @type {Map.<string,boolean>}
  * @const
  */
 let defaultDomains = new Map([["", true]]);
 
 /**
  * Set containing known element hiding filters
  * @type {Set.<ElemHideFilter>}

[Manish Jethani, 2018/05/17 05:42:48]

We can use the specific type now in the documentation, as a bonus.

  */
 let knownFilters = new Set();
 
 /**
  * Adds a filter to the lookup table of filters by domain.
  * @param {Filter} filter
  */
 function addToFiltersByDomain(filter)
 {
   let domains = filter.domains || defaultDomains;
@@ skipping 38 matching lines @@
 /**
  * Container for element hiding filters
  * @class
  */
 exports.ElemHide = {
   /**
    * Removes all known filters
    */
   clear()
   {
-    for (let collection of [filtersByDomain, filterBySelector,
-                            knownFilters])
-    {
+    for (let collection of [filtersByDomain, filterBySelector, knownFilters])
       collection.clear();
-    }
+
     unconditionalSelectors = null;
     FilterNotifier.emit("elemhideupdate");
   },
 
   /**
    * Add a new element hiding filter
    * @param {ElemHideFilter} filter
    */
   add(filter)
   {
     if (knownFilters.has(filter))
       return;
 
-    if (!(filter.domains || ElemHideExceptions.hasExceptions(filter.selector)))
+    let {selector} = filter;
+
+    if (!(filter.domains || ElemHideExceptions.hasExceptions(selector)))
     {
       // The new filter's selector is unconditionally applied to all domains
-      filterBySelector.set(filter.selector, filter);
+      filterBySelector.set(selector, filter);
       unconditionalSelectors = null;
     }
     else
     {
       // The new filter's selector only applies to some domains
       addToFiltersByDomain(filter);
     }
 
     knownFilters.add(filter);
     FilterNotifier.emit("elemhideupdate");
   },
 
   /**
    * Removes an element hiding filter
    * @param {ElemHideFilter} filter
    */
   remove(filter)
   {
     if (!knownFilters.has(filter))
       return;
 
+    let {selector} = filter;
+
     // Unconditially applied element hiding filters
-    if (filterBySelector.get(filter.selector) == filter)
-    {
-      filterBySelector.delete(filter.selector);
+    if (filterBySelector.get(selector) == filter)
+    {
+      filterBySelector.delete(selector);
       unconditionalSelectors = null;
     }
     // Conditionally applied element hiding filters
     else
     {
       let domains = filter.domains || defaultDomains;
       for (let domain of domains.keys())
       {
         let filters = filtersByDomain.get(domain);
         if (filters)
@@ skipping 10 matching lines @@
    * on a particular host name.
    * @param {string} domain
    * @param {boolean} [specificOnly] true if generic filters should not apply.
    * @returns {string[]} List of selectors.
    */
   getSelectorsForDomain(domain, specificOnly = false)
   {
     let selectors = [];
 
     let excluded = new Set();
-    let currentDomain = domain ? domain.toUpperCase() : "";
+    let currentDomain = domain ? domain.replace(/\.+$/, "").toLowerCase() : "";
 
     // This code is a performance hot-spot, which is why we've made certain
     // micro-optimisations. Please be careful before making changes.
     while (true)
     {
       if (specificOnly && currentDomain == "")
         break;
 
       let filters = filtersByDomain.get(currentDomain);
       if (filters)
       {
         for (let [filter, isIncluded] of filters)
         {
           if (!isIncluded)
           {
             excluded.add(filter);
           }
-          else if ((excluded.size == 0 || !excluded.has(filter)) &&
-                   !ElemHideExceptions.getException(filter, domain))
+          else
           {
-            selectors.push(filter.selector);
+            let {selector} = filter;
+            if ((excluded.size == 0 || !excluded.has(filter)) &&
+                !ElemHideExceptions.getException(selector, domain))
+            {
+              selectors.push(selector);
+            }
           }
         }
       }
 
       if (currentDomain == "")
         break;
 
       let nextDot = currentDomain.indexOf(".");
       currentDomain = nextDot == -1 ? "" : currentDomain.substr(nextDot + 1);
     }
 
     if (!specificOnly)
       selectors = getUnconditionalSelectors().concat(selectors);
 
     return selectors;
   }
 };