From 887ae607dd88668dc55b7020899dbd619536adb9 Mon Sep 17 00:00:00 2001 From: Raymond Hill Date: Wed, 9 Jul 2025 17:20:21 -0400 Subject: [PATCH] [mv3] Fix usage of getMatchedRules() --- platform/mv3/extension/js/debug.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/platform/mv3/extension/js/debug.js b/platform/mv3/extension/js/debug.js index 77231b017..b11e84725 100644 --- a/platform/mv3/extension/js/debug.js +++ b/platform/mv3/extension/js/debug.js @@ -48,9 +48,8 @@ matchedRules.fill(null); let writePtr = 0; const pruneLongLists = list => { - if ( list.length <= 21 ) { return list; } - return [ ...list.slice(0, 10), '...', ...list.slice(-10) ]; - + if ( list.length <= 11 ) { return list; } + return [ ...list.slice(0, 5), '...', ...list.slice(-5) ]; }; const getRuleset = async rulesetId => { @@ -95,8 +94,9 @@ const getRuleDetails = async ruleInfo => { /******************************************************************************/ export const getMatchedRules = (( ) => { - const noopFn = ( ) => Promise.resolve([]); - if ( isSideloaded !== true ) { return noopFn; } + if ( isSideloaded !== true ) { + return ( ) => Promise.resolve([]); + } if ( isModern ) { return async tabId => { @@ -120,11 +120,11 @@ export const getMatchedRules = (( ) => { if ( typeof dnr.getMatchedRules !== 'function' ) { return []; } const matchedRules = await dnr.getMatchedRules({ tabId }); if ( matchedRules instanceof Object === false ) { return []; } - const out = []; - for ( const ruleInfo of matchedRules.rulesMatchedInfo ) { - out.push({ request: ruleInfo.request }); + const promises = []; + for ( const { tabId, rule } of matchedRules.rulesMatchedInfo ) { + promises.push(getRuleDetails({ request: { tabId }, rule })); } - return out; + return Promise.all(promises); }; })();