Properly handle converted procedural filters in logger

Related issue: - uBlockOrigin/uBlock-issues#2624
gorhill · Apr 29, 2023 · 5fd35ff · 5fd35ff
1 parent a3b74cd
commit 5fd35ff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/js/contentscript.js b/src/js/contentscript.js
@@ -663,9 +663,9 @@ vAPI.DOMFilterer = class {
             const proceduralFilterer = this.proceduralFiltererInstance();
             if ( proceduralFilterer !== null ) {
                 for ( const json of this.convertedProceduralFilters ) {
-                    out.procedural.push(
-                        proceduralFilterer.createProceduralFilter(json)
-                    );
+                    const pfilter = proceduralFilterer.createProceduralFilter(json);
+                    pfilter.converted = true;
+                    out.procedural.push(pfilter);
                 }
             }
         }

diff --git a/src/js/scriptlets/cosmetic-logger.js b/src/js/scriptlets/cosmetic-logger.js
@@ -141,16 +141,18 @@ const processDeclarativeComplex = function(out) {
 
 /******************************************************************************/
 
-const processProcedural = function(out) {
+function processProcedural(out) {
     if ( proceduralDict.size === 0 ) { return; }
     for ( const [ raw, pselector ] of proceduralDict ) {
-        if ( pselector.hit === false && pselector.exec().length === 0 ) {
+        if ( pselector.converted ) {
+            if ( safeQuerySelector(pselector.selector) === null ) { continue; }
+        } else if ( pselector.hit === false && pselector.exec().length === 0 ) {
             continue;
         }
         out.push(`##${raw}`);
         proceduralDict.delete(raw);
     }
-};
+}
 
 /******************************************************************************/