From 987c9c1a21732a0b296efb049a81741c0462c9d2 Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Fri, 1 Nov 2019 14:01:30 -0400
Subject: [PATCH] Fix on-demand no-cosmetic-filtering badge when generichide in
 use

Related feedback:
- https://github.com/gorhill/uBlock/commit/c090d2fde45a8b3ee9f558d17f162dec90aef7ca#commitcomment-35767596

Mind that there might not be selectors to match as a
result of `generichide` or `no-cosmetic-filtering`.
---
 src/js/scriptlets/dom-survey-elements.js | 35 +++++++++++++++++-------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/js/scriptlets/dom-survey-elements.js b/src/js/scriptlets/dom-survey-elements.js
index 70416bbab..e315b8b1a 100644
--- a/src/js/scriptlets/dom-survey-elements.js
+++ b/src/js/scriptlets/dom-survey-elements.js
@@ -52,7 +52,12 @@
         surveyResults.hiddenElementCount = (( ) => {
             if ( vAPI.domFilterer instanceof Object === false ) { return 0; }
             const details = vAPI.domFilterer.getAllSelectors_(true);
-            if ( Array.isArray(details.declarative) === false ) { return 0; }
+            if (
+                Array.isArray(details.declarative) === false ||
+                details.declarative.length === 0
+            ) {
+                return 0;
+            }
             const selectors = details.declarative.map(entry => entry[0]);
             const simple = [], complex = [];
             for ( const selectorStr of selectors ) {
@@ -70,19 +75,29 @@
                 document.body,
                 NodeFilter.SHOW_ELEMENT
             );
-            const matched = new Set();
+            const candidates = new Set();
             for (;;) {
                 const node = nodeIter.nextNode();
                 if ( node === null ) { break; }
-                if ( node.offsetParent !== null ) { continue; }
-                if (
-                    node.matches(simpleStr) === false &&
-                    node.closest(complexStr) !== node
-                ) {
-                    continue;
+                if ( node.offsetParent === null ) {
+                    candidates.add(node);
+                }
+            }
+            const matched = new Set();
+            if ( simpleStr !== '') {
+                for ( const node of candidates ) {
+                    if ( node.matches(simpleStr) === false ) { continue; }
+                    candidates.delete(node);
+                    matched.add(node);
+                    if ( matched.size === 99 ) { break; }
+                }
+            }
+            if ( matched.size < 99 && complexStr !== '') {
+                for ( const node of candidates ) {
+                    if ( node.closest(complexStr) !== node ) { continue; }
+                    matched.add(node);
+                    if ( matched.size === 99 ) { break; }
                 }
-                matched.add(node);
-                if ( matched.size === 99 ) { break; }
             }
             return matched.size;
         })();