Issue 6927 - Expose pattern from RegExpFilter

lib/filterClasses.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 22 matching lines @@
 
 /**
  * Abstract base class for filters
  *
  * @param {string} text   string representation of the filter
  * @constructor
  */
 function Filter(text)
 {
   this.text = text;
-  this.subscriptions = new Set();
+
+  /**
+   * Subscriptions to which this filter belongs.
+   * @type {(Subscription|Set.<Subscription>)?}
+   * @private
+   */
+  this._subscriptions = null;
 }
 exports.Filter = Filter;
 
 Filter.prototype =
 {
   /**
    * String representation of the filter
    * @type {string}
    */
   text: null,
 
   /**
-   * Filter subscriptions the filter belongs to
-   * @type {Set.<Subscription>}
-   */
-  subscriptions: null,
-
-  /**
    * Filter type as a string, e.g. "blocking".
    * @type {string}
    */
   get type()
   {
     throw new Error("Please define filter type in the subclass");
+  },
+
+  /**
+   * Yields subscriptions to which the filter belongs.
+   * @yields {Subscription}
+   */
+  *subscriptions()
+  {
+    if (this._subscriptions)
+    {
+      if (this._subscriptions instanceof Set)
+        yield* this._subscriptions;
+      else
+        yield this._subscriptions;
+    }
+  },
+
+  /**
+   * The number of subscriptions to which the filter belongs.
+   * @type {number}
+   */
+  get subscriptionCount()
+  {
+    if (this._subscriptions instanceof Set)
+      return this._subscriptions.size;
+
+    return this._subscriptions ? 1 : 0;
+  },
+
+  /**
+   * Adds a subscription to the set of subscriptions to which the filter
+   * belongs.
+   * @param {Subscription} subscription
+   */
+  addSubscription(subscription)
+  {
+    // Since we use truthy checks in our logic, we must avoid adding a
+    // subscription that isn't a non-null object.
+    if (subscription === null || typeof subscription != "object")
+      return;
+
+    if (this._subscriptions)
+    {
+      if (this._subscriptions instanceof Set)
+        this._subscriptions.add(subscription);
+      else if (subscription != this._subscriptions)
+        this._subscriptions = new Set([this._subscriptions, subscription]);
+    }
+    else
+    {
+      this._subscriptions = subscription;
+    }
+  },
+
+  /**
+   * Removes a subscription from the set of subscriptions to which the filter
+   * belongs.
+   * @param {Subscription} subscription
+   */
+  removeSubscription(subscription)
+  {
+    if (this._subscriptions)
+    {
+      if (this._subscriptions instanceof Set)
+      {
+        this._subscriptions.delete(subscription);
+
+        if (this._subscriptions.size == 1)
+          this._subscriptions = [...this._subscriptions][0];
+      }
+      else if (subscription == this._subscriptions)
+      {
+        this._subscriptions = null;
+      }
+    }
   },
 
   /**
    * Serializes the filter to an array of strings for writing out on the disk.
    * @param {string[]} buffer  buffer to push the serialization results into
    */
   serialize(buffer)
   {
     buffer.push("[Filter]");
     buffer.push("text=" + this.text);
@@ skipping 567 matching lines @@
    * for delayed creation of the regexp property
    * @type {?string}
    */
   pattern: null,
   /**
    * Regular expression to be used when testing against this filter
    * @type {RegExp}
    */
   get regexp()
   {
-    let source = filterToRegExp(this.pattern);
+    let source = filterToRegExp(this.pattern, this.rewrite != null);
     let regexp = new RegExp(source, this.matchCase ? "" : "i");
     Object.defineProperty(this, "regexp", {value: regexp});
     return regexp;
   },
   /**
    * Content types the filter applies to, combination of values from
    * RegExpFilter.typeMap
    * @type {number}
    */
   contentType: 0x7FFFFFFF,
@@ skipping 509 matching lines @@
 
   /**
    * Script that should be executed
    * @type {string}
    */
   get script()
   {
     return this.body;
   }
 });