Issue 3143 - Filter elements with :-abp-has()

chrome/content/elemHideEmulation.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 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 135 matching lines @@
     return [new PlainSelector(selector)];
 
   let selectors = [];
   if (match.index > 0)
     selectors.push(new PlainSelector(selector.substr(0, match.index)));
 
   let startIndex = match.index + match[0].length;
   let content = parseSelectorContent(selector, startIndex);
   if (!content)
   {
-    reportError(new SyntaxError("Failed parsing content filter " +
-                                `selector ${selector}, didn't ` +
-                                "find closing parenthesis."));
+    reportError(new SyntaxError("Failed to parse Adblock Plus " +
+                                `selector ${selector}, ` +
+                                "due to unmatched parentheses."));
     return null;
   }
   if (match[1] == "properties")
     selectors.push(new PropsSelector(content.text));
   else if (match[1] == "has")
   {
     let hasSelector = new HasSelector(content.text);
     if (!hasSelector.valid())
       return null;
     selectors.push(hasSelector);
   }
   else
   {
     // this is an error, can't parse selector.
-    reportError(new SyntaxError("Failed parsing content filter " +
+    reportError(new SyntaxError("Failed to parse Adblock Plus " +
                                 `selector ${selector}, invalid ` +
-                                `pseudo-class -abp-${match[1]}().`));
+                                `pseudo-class :-abp-${match[1]}().`));
     return null;
   }
 
   let suffix = parseSelector(selector.substr(content.end + 1));
   if (suffix == null)
     return null;
 
   selectors.push(...suffix);
 
   return selectors;
@@ skipping 135 matching lines @@
   }
 };
 
 function ElemHideEmulation(window, getFiltersFunc, addSelectorsFunc,
                            hideElemsFunc)
 {
   this.window = window;
   this.getFiltersFunc = getFiltersFunc;
   this.addSelectorsFunc = addSelectorsFunc;
   this.hideElemsFunc = hideElemsFunc;
-  reportError = error => this.window.console.error(error);

[Wladimir Palant, 2017/06/13 13:16:25]

This won't work. There might be multiple windows loading in parallel, you could
end up overwriting this variable before it is used. I see who solution:

1) Quick and dirty: move this assignment into getFiltersFunc callback, all
potential error reporting is happening synchronously there.

2) Proper: pass reportError function to the functions as parameter wherever
necessary.

I will accept 1) given the urgency but only if an issue is filed to implement
2).

[hub, 2017/06/13 13:53:33]

doing 1)

 }
 
 ElemHideEmulation.prototype = {
   isSameOrigin(stylesheet)
   {
     try
     {
       return new URL(stylesheet.href).origin == this.window.location.origin;
     }
     catch (e)
@@ skipping 63 matching lines @@
   {
     let stylesheet = event.target.sheet;
     if (stylesheet)
       this.addSelectors([stylesheet]);
   },
 
   apply()
   {
     this.getFiltersFunc(patterns =>
     {
+      let oldReportError = reportError;
+      reportError = error => this.window.console.error(error);
+
       this.patterns = [];
       for (let pattern of patterns)
       {
         let selectors = parseSelector(pattern.selector);
         if (selectors != null && selectors.length > 0)
           this.patterns.push({selectors, text: pattern.text});
       }
 
       if (this.patterns.length > 0)
       {
         let {document} = this.window;
         this.addSelectors(document.styleSheets);
         document.addEventListener("load", this.onLoad.bind(this), true);
       }
+      reportError = oldReportError;
     });
   }
 };