Issue 6843 - Log snippet filter hits

lib/contentFiltering.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
@@ skipping 193 matching lines @@
       // this is exactly, but we simply ignore the error.
       if (/^No frame with id \d+ in tab \d+\.$/.test(error.message))
         return;
 
       throw error;
     });
   }
   catch (error)
   {
     // See the comment in the catch block associated with the call to
-    // tabs.insertCSS for why we catch and simply reject the promise.

[Manish Jethani, 2018/08/27 15:40:49]

I think this would read better as "... why we catch any errors here and simply
return a rejected promise."

[hub, 2018/08/27 16:42:04]

Done.

+    // tabs.insertCSS for why we catch any error here and simply
+    // return a rejected promise.
     return Promise.reject(error);
   }
 }
 
 port.on("content.applyFilters", (message, sender) =>
 {
   let selectors = [];
   let emulatedPatterns = [];
   let trace = HitLogger.hasListener(sender.page.id);
   let inline = !userStyleSheetsSupported;
 
   let {elemhide, snippets} = message.filterTypes ||
                              {elemhide: true, snippets: true};
 
   if (!checkWhitelisted(sender.page, sender.frame, null,
                         RegExpFilter.typeMap.DOCUMENT))
   {
     let docDomain = extractHostFromFrame(sender.frame);
 
     if (snippets)
     {
       for (let filter of Snippets.getFiltersForDomain(docDomain))

[Manish Jethani, 2018/08/27 15:40:49]

Nit: As a convention we have been adding braces around the block if it spans
multiple lines (even if it's a single JS statement), maybe we should do that
here as well.

[hub, 2018/08/27 16:42:04]

Done.

-        executeScript(filter.script, sender.page.id, sender.frame.id)
-        .then(() =>
+      {
+        executeScript(filter.script, sender.page.id, sender.frame.id).then(() =>
         {
           let tabIds = [sender.page.id];
           if (filter)
             FilterNotifier.emit("filter.hitCount", filter, 0, 0, tabIds);
 
           logRequest(tabIds, {
-            url: sender.frame.url.href, type: "SNIPPET",

[Manish Jethani, 2018/08/27 15:40:49]

Nit: When an object literal spans multiple lines, we typically place each
property on its own line.

[hub, 2018/08/27 16:42:04]

Done.

+            url: sender.frame.url.href,
+            type: "SNIPPET",
             docDomain
           }, filter);
         });
+      }
     }
 
     if (elemhide && !checkWhitelisted(sender.page, sender.frame, null,
                                       RegExpFilter.typeMap.ELEMHIDE))
     {
       let specificOnly = checkWhitelisted(sender.page, sender.frame, null,
                                           RegExpFilter.typeMap.GENERICHIDE);
       selectors = ElemHide.getSelectorsForDomain(docDomain, specificOnly);
 
       for (let filter of ElemHideEmulation.getRulesForDomain(docDomain))
@@ skipping 26 matching lines @@
   updateFrameStyles(sender.page.id, sender.frame.id, message.selectors,
                     message.groupName, message.appendOnly);
 });
 
 fetch(browser.extension.getURL("/snippets.js"), {cache: "no-cache"})
 .then(response => response.ok ? response.text() : "")
 .then(text =>
 {
   snippetsLibrarySource = text;
 });