Issue 4864 - Start using ESLint for adblockpluschrome

lib/devtools.js

Index: lib/devtools.js
diff --git a/lib/devtools.js b/lib/devtools.js
index 89c50d4342816f4072cae2225c20d63fb6e44bd7..bcfc4abc1fe9dc4a34fe0c27096a51cb681c525a 100644
--- a/lib/devtools.js
+++ b/lib/devtools.js
@@ -17,7 +17,8 @@
 
 "use strict";
 
-const {RegExpFilter, WhitelistFilter, ElemHideFilter} = require("filterClasses");
+const {RegExpFilter,
+       WhitelistFilter, ElemHideFilter} = require("filterClasses");
 const {SpecialSubscription} = require("subscriptionClasses");
 const {FilterStorage} = require("filterStorage");
 const {defaultMatcher} = require("matcher");
@@ -40,7 +41,7 @@ function hasPanels()
 function getActivePanel(page)
 {
   let panel = panels[page.id];
-  if(panel && !panel.reload && !panel.reloading)
+  if (panel && !panel.reload && !panel.reloading)
     return panel;
   return null;
 }
@@ -67,7 +68,7 @@ function getFilterInfo(filter)
   return {
     text: filter.text,
     whitelisted: filter instanceof WhitelistFilter,
-    userDefined: userDefined,
+    userDefined,
     subscription: subscriptionTitle
   };
 }
@@ -75,13 +76,14 @@ function getFilterInfo(filter)
 function hasRecord(panel, request, filter)
 {
   return panel.records.some(record =>
-    record.request.url       == request.url       &&
+    record.request.url == request.url &&
     record.request.docDomain == request.docDomain &&
 
     // Ignore partial (e.g. ELEMHIDE) whitelisting if there is already
     // a DOCUMENT exception which disables all means of blocking.
-    (record.request.type == "DOCUMENT" ? nonRequestTypes.indexOf(request.type) != -1
-                                       : record.request.type == request.type) &&
+    (record.request.type == "DOCUMENT"
+     ? nonRequestTypes.indexOf(request.type) != -1
+     : record.request.type == request.type) &&
 
     // Matched element hiding filters don't relate to a particular request,
     // so we also have to match the CSS selector in order to distinguish them.
@@ -95,14 +97,11 @@ function addRecord(panel, request, filter)
   {
     panel.port.postMessage({
       type: "add-record",
-      request: request,
+      request,
       filter: getFilterInfo(filter)
     });
 
-    panel.records.push({
-      request: request,
-      filter: filter
-    });
+    panel.records.push({request, filter});
   }
 }
 
@@ -125,10 +124,12 @@ function matchRequest(request)
  * @param {string}   url           The URL of the request
  * @param {string}   type          The request type
  * @param {string}   docDomain     The IDN-decoded hostname of the document
- * @param {boolean}  thirdParty    Whether the origin of the request and document differs
+ * @param {boolean}  thirdParty    Whether the origin of the request and
+ *                                 document differs
  * @param {?string}  sitekey       The active sitekey if there is any
  * @param {?boolean} specificOnly  Whether generic filters should be ignored
- * @param {?BlockingFilter} filter The matched filter or null if there is no match
+ * @param {?BlockingFilter} filter The matched filter or null if there is no
+ *                                 match
  */
 exports.logRequest = function(page, url, type, docDomain,
                               thirdParty, sitekey,
@@ -137,16 +138,8 @@ exports.logRequest = function(page, url, type, docDomain,
   let panel = getActivePanel(page);
   if (panel)
   {
-    let request = {
-      url: url,
-      type: type,
-      docDomain: docDomain,
-      thirdParty: thirdParty,
-      sitekey: sitekey,
-      specificOnly: specificOnly
-    };
-
-    addRecord(panel, request, filter);
+    addRecord(panel, {url, type, docDomain, thirdParty, sitekey, specificOnly},

[Sebastian Noack, 2017/02/09 01:04:50]

Perhaps use a temporary variable again for the long literal. The way this
function call is wrapped isn't any better than the original code here.

[kzar, 2017/02/20 10:27:31]

I think it's slightly nicer like this and would prefer to leave it.

+              filter);
   }
 };
 
@@ -160,6 +153,7 @@ exports.logRequest = function(page, url, type, docDomain,
 function logHiddenElements(page, selectors, docDomain)
 {
   let panel = getActivePanel(page);
+  if (panel)
   {
     for (let subscription of FilterStorage.subscriptions)
     {
@@ -175,11 +169,11 @@ function logHiddenElements(page, selectors, docDomain)
         if (!filter.isActiveOnDomain(docDomain))
           continue;
 
-        addRecord(panel, {type: "ELEMHIDE", docDomain: docDomain}, filter);
+        addRecord(panel, {type: "ELEMHIDE", docDomain}, filter);
       }
     }
   }
-};
+}
 
 /**
  * Logs a whitelisting filter, that disables (some kind of)
@@ -187,11 +181,14 @@ function logHiddenElements(page, selectors, docDomain)
  *
  * @param {Page}         page      The page the whitelisting is active on
  * @param {string}       url       The url of the whitelisted document
- * @param {number}       typeMask  The bit mask of whitelisting types checked for
- * @param {string}       docDomain The IDN-decoded hostname of the parent document
+ * @param {number}       typeMask  The bit mask of whitelisting types checked
+ *                                 for
+ * @param {string}       docDomain The IDN-decoded hostname of the parent
+ *                                 document
  * @param {WhitelistFilter} filter The matched whitelisting filter
  */
-exports.logWhitelistedDocument = function(page, url, typeMask, docDomain, filter)
+exports.logWhitelistedDocument = function(page, url, typeMask, docDomain,
+                                          filter)
 {
   let panel = getActivePanel(page);
   if (panel)
@@ -199,7 +196,7 @@ exports.logWhitelistedDocument = function(page, url, typeMask, docDomain, filter
     for (let type of nonRequestTypes)
     {
       if (typeMask & filter.contentType & RegExpFilter.typeMap[type])
-        addRecord(panel, {url: url, type: type, docDomain: docDomain}, filter);
+        addRecord(panel, {url, type, docDomain}, filter);
     }
   }
 };
@@ -333,9 +330,9 @@ function onSubscriptionAdded(subscription)
     updateFilters(subscription.filters, true);
 }
 
-chrome.runtime.onConnect.addListener(port =>
+chrome.runtime.onConnect.addListener(newPort =>
 {
-  let match = port.name.match(/^devtools-(\d+)$/);
+  let match = newPort.name.match(/^devtools-(\d+)$/);
   if (!match)
     return;
 
@@ -345,7 +342,7 @@ chrome.runtime.onConnect.addListener(port =>
   chrome.webRequest.onBeforeRequest.addListener(
     localOnBeforeRequest,
     {
-      urls:  ["<all_urls>"],
+      urls: ["<all_urls>"],
       types: ["main_frame"],
       tabId: inspectedTabId
     }
@@ -359,7 +356,7 @@ chrome.runtime.onConnect.addListener(port =>
     FilterNotifier.on("subscription.added", onSubscriptionAdded);
   }
 
-  port.onDisconnect.addListener(() =>
+  newPort.onDisconnect.addListener(() =>
   {
     delete panels[inspectedTabId];
     chrome.webRequest.onBeforeRequest.removeListener(localOnBeforeRequest);
@@ -373,7 +370,7 @@ chrome.runtime.onConnect.addListener(port =>
     }
   });
 
-  panels[inspectedTabId] = {port: port, records: []};
+  panels[inspectedTabId] = {port: newPort, records: []};
 });
 
 port.on("devtools.traceElemHide", (message, sender) =>