Issue 6538, 6781 - Implement support for snippet filters

lib/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 125 matching lines @@
  */
 function addFilter(filter)
 {
   if (!(filter instanceof ActiveFilter) || filter.disabled)
     return;
 
   let hasEnabled = false;
   for (let i = 0; i < filter.subscriptions.length; i++)
   {
     if (!filter.subscriptions[i].disabled)
+    {
       hasEnabled = true;
+      break;
+    }
   }
   if (!hasEnabled)
     return;
 
   if (filter instanceof RegExpFilter)
     defaultMatcher.add(filter);
   else if (filter instanceof ElemHideBase)
   {
     if (filter instanceof ElemHideEmulationFilter)
       ElemHideEmulation.add(filter);
@@ skipping 13 matching lines @@
 {
   if (!(filter instanceof ActiveFilter))
     return;
 
   if (!filter.disabled)
   {
     let hasEnabled = false;
     for (let i = 0; i < filter.subscriptions.length; i++)
     {
       if (!filter.subscriptions[i].disabled)
+      {
         hasEnabled = true;
+        break;
+      }
     }
     if (hasEnabled)
       return;
   }
 
   if (filter instanceof RegExpFilter)
     defaultMatcher.remove(filter);
   else if (filter instanceof ElemHideBase)
   {
     if (filter instanceof ElemHideEmulationFilter)
@@ skipping 43 matching lines @@
   FilterListener.setDirty(1);
 
   if (!subscription.disabled)
     subscription.filters.forEach(removeFilter);
 }
 
 function onSubscriptionDisabled(subscription, newValue)
 {
   FilterListener.setDirty(1);
 
-  if (subscription.url in FilterStorage.knownSubscriptions)
+  if (FilterStorage.knownSubscriptions.has(subscription.url))
   {
     if (newValue == false)
       addFilters(subscription.filters);
     else
       subscription.filters.forEach(removeFilter);
   }
 }
 
 function onSubscriptionUpdated(subscription)
 {
   FilterListener.setDirty(1);
 
-  if (subscription.url in FilterStorage.knownSubscriptions &&
-      !subscription.disabled)
+  if (!subscription.disabled &&
+      FilterStorage.knownSubscriptions.has(subscription.url))
   {
     subscription.oldFilters.forEach(removeFilter);
     addFilters(subscription.filters);
   }
 }
 
 function onFilterHitCount(filter, newValue)
 {
   if (newValue == 0)
     FilterListener.setDirty(0);
@@ skipping 49 matching lines @@
   {
     if (!subscription.disabled)
       addFilters(subscription.filters);
   }
 }
 
 function onSave()
 {
   isDirty = 0;
 }