Issue 6034 - :-abp-contains() accept a regular expression

lib/content/elemHideEmulation.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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 "use strict";
 
-const {escapeRegExp, filterToRegExp, splitSelector} = require("../common");
+const {textToRegExp, filterToRegExp, splitSelector} = require("../common");
 
 let MIN_INVOCATION_INTERVAL = 3000;
 const MAX_SYNCHRONOUS_PROCESSING_TIME = 50;
 const abpSelectorRegexp = /:-abp-([\w-]+)\(/i;
 
 /** Return position of node from parent.
  * @param {Node} node the node to find the position of.
  * @return {number} One-based index like for :nth-child(), or 0 on error.
  */
 function positionInParent(node)
@@ skipping 139 matching lines @@
 {
   return scopedQuerySelector(subtree, selector, true);
 }
 
 const regexpRegexp = /^\/(.*)\/([im]*)$/;
 
 /**
  * Make a regular expression from a text argument. If it can be parsed as a
  * regular expression, parse it and the flags.
  * @param {string} text the text argument.
- * it overrides flags passed in the text argument.

[Manish Jethani, 2018/02/21 14:41:59]

This line got left out.

[hub, 2018/02/21 21:38:01]

Done.

  * @return {?RegExp} a RegExp object or null in case of error.
  */
 function makeRegExpParameter(text)
 {
-  let flags;
-  let regexpString = null;
-  let match = regexpRegexp.exec(text);
-  if (match)

[Manish Jethani, 2018/02/21 14:41:59]

So we're having a discussion on #eyeo-js about modernizing our use of JS a
little. This could be written as:

  let [, regexpString, flags] = regexpRegexp.exec(text) || [,
escapeRegExp(text)];

That's 10 lines of code reduced to one.

[Manish Jethani, 2018/02/21 14:46:38]

That spills over the 80 character line length, but we can just rename it to
"pattern" which is what the RegExp documentation calls it anyway.

So:

  let [, pattern, flags] = regexpRegexp.exec(text) || [, escapeRegExp(text)];
  try
  {
    return new RegExp(pattern, flags);
  }
  catch (e)
  {
  }
  return null;

[hub, 2018/02/21 21:38:00]

Done.

-  {
-    regexpString = match[1];
-    flags = match[2];
-  }
-  else
-    regexpString = escapeRegExp(text);
+  let [, pattern, flags] =
+      regexpRegexp.exec(text) || [undefined, textToRegExp(text)];
 
   try
   {
-    return new RegExp(regexpString, flags);
+    return new RegExp(pattern, flags);
   }
   catch (e)
   {
   }
   return null;
 }
 
 function* evaluate(chain, index, prefix, subtree, styles)
 {
   if (index >= chain.length)
@@ skipping 132 matching lines @@
   this._regexp = new RegExp(regexpString, "i");
 }
 
 PropsSelector.prototype = {
   preferHideWithSelector: true,
   dependsOnStyles: true,
 
   *findPropsSelectors(styles, prefix, regexp)
   {
     for (let style of styles)
-      if (regexp && regexp.test(style.style))

[Manish Jethani, 2018/02/21 14:41:59]

This check is no longer necessary? (i.e. this._regexp is always non-null)

[hub, 2018/02/21 21:38:00]

Done.

+      if (regexp.test(style.style))
         for (let subSelector of style.subSelectors)
         {
           if (subSelector.startsWith("*") &&
               !incompletePrefixRegexp.test(prefix))
           {
             subSelector = subSelector.substr(1);
           }
           let idx = subSelector.lastIndexOf("::");
           if (idx != -1)
             subSelector = subSelector.substr(0, idx);
@@ skipping 316 matching lines @@
           characterData: true,
           subtree: true
         }
       );
       this.document.addEventListener("load", this.onLoad.bind(this), true);
     }
   }
 };
 
 exports.ElemHideEmulation = ElemHideEmulation;