Issue 6538, 6781 - Implement support for snippet filters

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 99 matching lines @@
    * Add a new element hiding filter
    * @param {ElemHideFilter} filter
    */
   add(filter)
   {
     if (filter instanceof ElemHideException)
     {
       if (knownExceptions.has(filter.text))
         return;
 
-      let {selector} = filter;
-      let list = exceptions.get(selector);
+      let {code} = filter;
+      let list = exceptions.get(code);
       if (list)
         list.push(filter);
       else
-        exceptions.set(selector, [filter]);
+        exceptions.set(code, [filter]);
 
       // If this is the first exception for a previously unconditionally
       // applied element hiding selector we need to take care to update the
       // lookups.
-      let filterKey = filterKeyBySelector.get(selector);
+      let filterKey = filterKeyBySelector.get(code);
       if (typeof filterKey != "undefined")
       {
         this._addToFiltersByDomain(filterKey, filterByKey[filterKey]);
-        filterKeyBySelector.delete(selector);
+        filterKeyBySelector.delete(code);
         unconditionalSelectors = null;
       }
 
       knownExceptions.add(filter.text);
     }
     else
     {
       if (keyByFilter.has(filter))
         return;
 
       let key = filterByKey.push(filter) - 1;
       keyByFilter.set(filter, key);
 
-      if (!(filter.domains || exceptions.has(filter.selector)))
+      if (!(filter.domains || exceptions.has(filter.code)))
       {
         // The new filter's selector is unconditionally applied to all domains
-        filterKeyBySelector.set(filter.selector, key);
+        filterKeyBySelector.set(filter.code, key);
         unconditionalSelectors = null;
       }
       else
       {
         // The new filter's selector only applies to some domains
         this._addToFiltersByDomain(key, filter);
       }
     }
 
     FilterNotifier.emit("elemhideupdate");
   },
 
   _removeFilterKey(key, filter)
   {
-    if (filterKeyBySelector.get(filter.selector) == key)
+    if (filterKeyBySelector.get(filter.code) == key)
     {
-      filterKeyBySelector.delete(filter.selector);
+      filterKeyBySelector.delete(filter.code);
       unconditionalSelectors = null;
       return;
     }
 
     // We haven't found this filter in unconditional filters, look in
     // filtersByDomain.
     let domains = filter.domains || defaultDomains;
     for (let domain of domains.keys())
     {
       let filters = filtersByDomain.get(domain);
       if (filters)
         filters.delete(key);
     }
   },
 
   /**
    * Removes an element hiding filter
    * @param {ElemHideFilter} filter
    */
   remove(filter)
   {
     if (filter instanceof ElemHideException)
     {
       if (!knownExceptions.has(filter.text))
         return;
 
-      let list = exceptions.get(filter.selector);
+      let list = exceptions.get(filter.code);
       let index = list.indexOf(filter);
       if (index >= 0)
         list.splice(index, 1);
       knownExceptions.delete(filter.text);
     }
     else
     {
       let key = keyByFilter.get(filter);
       if (typeof key == "undefined")
         return;
 
       delete filterByKey[key];
       keyByFilter.delete(filter);
       this._removeFilterKey(key, filter);
     }
 
     FilterNotifier.emit("elemhideupdate");
   },
 
   /**
    * Checks whether an exception rule is registered for a filter on a particular
    * domain.
    * @param {Filter} filter
    * @param {string} docDomain
    * @return {ElemHideException}
    */
   getException(filter, docDomain)
   {
-    let list = exceptions.get(filter.selector);
+    let list = exceptions.get(filter.code);
     if (!list)
       return null;
 
     for (let i = list.length - 1; i >= 0; i--)
     {
       if (list[i].isActiveOnDomain(docDomain))
         return list[i];
     }
 
     return null;
@@ skipping 68 matching lines @@
       let filters = filtersByDomain.get(currentDomain);
       if (filters)
       {
         for (let [filterKey, filter] of filters)
         {
           if (seenFilters.has(filterKey))
             continue;
           seenFilters.add(filterKey);
 
           if (filter && !this.getException(filter, domain))
-            selectors.push(filter.selector);
+            selectors.push(filter.code);
         }
       }
 
       if (currentDomain == "")
         break;
 
       let nextDot = currentDomain.indexOf(".");
       currentDomain = nextDot == -1 ? "" : currentDomain.substr(nextDot + 1);
     }
 
     return selectors;
   }
 };