Issue 4864 - Start using ESLint for adblockpluschrome

lib/devtools.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 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 60 matching lines @@
   return {
     text: filter.text,
     whitelisted: filter instanceof WhitelistFilter,
     userDefined,
     subscription: subscriptionTitle
   };
 }
 
 function hasRecord(panel, request, filter)
 {
-  for (let record of panel.records)
-  {
-    if (record.request.url != request.url ||
-        record.request.docDomain != request.docDomain)
-      continue;
-
-    if (record.request.type == "DOCUMENT")
-    {
-      // Ignore partial (e.g. ELEMHIDE) whitelisting if there is already
-      // a DOCUMENT exception which disables all means of blocking.
-      if (!nonRequestTypes.includes(request.type))
-        continue;
-    }
-    else if (record.request.type != request.type)
-      continue;
+  return panel.records.some(record =>
+    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.includes(request.type) :
+       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.

[Sebastian Noack, 2017/03/31 07:59:37]

While thinking about a nicer way to do these checks, it took me quite a while to
wrap my head around this comment. I know, I wrote it initially. :D But I think
the intention is clearer when we change it like this:
 
  ... so we have to compare the selector in order to avoid duplicates.

[kzar, 2017/03/31 08:27:38]

Done.

-    if ((record.filter && record.filter.selector) ==
-        (filter && filter.selector))
-      return true;
-  }
-
-  return false;
+    // so we have to compare the selector in order to avoid duplicates.
+    (record.filter && record.filter.selector) == (filter && filter.selector)
+  );
 }
 
 function addRecord(panel, request, filter)
 {
   if (!hasRecord(panel, request, filter))
   {
     panel.port.postMessage({
       type: "add-record",
       request,
       filter: getFilterInfo(filter)
@@ skipping 272 matching lines @@
   panels[inspectedTabId] = {port: newPort, records: []};
 });
 
 port.on("devtools.traceElemHide", (message, sender) =>
 {
   logHiddenElements(
     sender.page, message.selectors,
     extractHostFromFrame(sender.frame)
   );
 });