Fix linter errors in lib

Author: philc

lib/chrome_api_stubs.js

@@ -49,19 +49,19 @@ if (shouldInstallStubs) {
     storage: {
       local: {
         async get() {
-          return {};
+          return await {};
         },
         async set() {},
       },
       sync: {
         async get() {
-          return {};
+          return await {};
         },
         async set() {},
       },
       session: {
         async get() {
-          return {};
+          return await {};
         },
         async set() {},
       },

lib/dom_utils.js

@@ -1,4 +1,4 @@
-var DomUtils = {
+const DomUtils = {
   //
   // Runs :callback if the DOM has loaded, otherwise runs it on load
   //
@@ -14,12 +14,12 @@ var DomUtils = {
     let callbacks = [];
     if (!isReady) {
       let onDOMContentLoaded;
-      window.addEventListener(
+      globalThis.addEventListener(
         "DOMContentLoaded",
         onDOMContentLoaded = forTrusted(function () {
-          window.removeEventListener("DOMContentLoaded", onDOMContentLoaded, true);
+          globalThis.removeEventListener("DOMContentLoaded", onDOMContentLoaded, true);
           isReady = true;
-          for (let callback of callbacks) callback();
+          for (const callback of callbacks) callback();
           callbacks = null;
         }),
         true,
@@ -40,15 +40,15 @@ var DomUtils = {
     let callbacks = [];
     if (!isComplete) {
       let onLoad;
-      window.addEventListener(
+      globalThis.addEventListener(
         "load",
         onLoad = forTrusted(function (event) {
           // The target is ensured to be on document. See
           // https://w3c.github.io/uievents/#event-type-load
           if (event.target !== document) return;
-          window.removeEventListener("load", onLoad, true);
+          globalThis.removeEventListener("load", onLoad, true);
           isComplete = true;
-          for (let callback of callbacks) callback();
+          for (const callback of callbacks) callback();
           callbacks = null;
         }),
         true,
@@ -105,7 +105,7 @@ var DomUtils = {
   // Test whether the current frame is the top/main frame.
   //
   isTopFrame() {
-    return window.top === window.self;
+    return globalThis.top === globalThis.self;
   },
 
   //
@@ -115,7 +115,7 @@ var DomUtils = {
   //
   makeXPath(elementArray) {
     const xpath = [];
-    for (let element of elementArray) {
+    for (const element of elementArray) {
       xpath.push(".//" + element, ".//xhtml:" + element);
     }
     return xpath.join(" | ");
@@ -155,7 +155,7 @@ var DomUtils = {
 
     // Inline elements with font-size: 0px; will declare a height of zero, even if a child with
     // non-zero font-size contains text.
-    var isInlineZeroHeight = function () {
+    let isInlineZeroHeight = function () {
       const elementComputedStyle = window.getComputedStyle(element, null);
       const isInlineZeroFontSize =
         (0 === elementComputedStyle.getPropertyValue("display").indexOf("inline")) &&
@@ -168,10 +168,9 @@ var DomUtils = {
     for (clientRect of clientRects) {
       // If the link has zero dimensions, it may be wrapping visible but floated elements. Check for
       // this.
-      var computedStyle;
+      let computedStyle;
       if (((clientRect.width === 0) || (clientRect.height === 0)) && testChildren) {
-        for (let child of Array.from(element.children)) {
-          var needle;
+        for (const child of Array.from(element.children)) {
           computedStyle = window.getComputedStyle(child, null);
           // Ignore child elements which are not floated and not absolutely positioned for parent
           // elements with zero width/height, as long as the case described at isInlineZeroHeight
@@ -237,7 +236,7 @@ var DomUtils = {
   getClientRectsForAreas(imgClientRect, areas) {
     const rects = [];
     for (const area of areas) {
-      var x1, x2, y1, y2;
+      let x1, x2, y1, y2;
       const coords = area.coords.split(",").map((coord) => parseInt(coord, 10));
       const shape = area.shape.toLowerCase();
       if (["rect", "rectangle"].includes(shape)) { // "rectangle" is an IE non-standard.
@@ -302,7 +301,7 @@ var DomUtils = {
 
   // Embedded elements like Flash and quicktime players can obtain focus.
   isEmbed(element) {
-    let nodeName = element.nodeName != null ? element.nodeName.toLowerCase() : null;
+    const nodeName = element.nodeName != null ? element.nodeName.toLowerCase() : null;
     return ["embed", "object"].includes(nodeName);
   },
 
@@ -361,7 +360,9 @@ var DomUtils = {
           if ((element.selectionStart === 0) && (element.selectionEnd === 0)) {
             return element.setSelectionRange(element.value.length, element.value.length);
           }
-        } catch (error) {}
+        } catch {
+          // Swallow
+        }
       }
     }
   },
@@ -370,7 +371,7 @@ var DomUtils = {
     if (modifiers == null) modifiers = {};
     const eventSequence = ["mouseover", "mousedown", "mouseup", "click"];
     const result = [];
-    for (let event of eventSequence) {
+    for (const event of eventSequence) {
       // In firefox prior to 96, simulating a click on an element would be blocked under some
       // conditions (#2602, #2960).
       // In 96+, extensions can trigger native click listeners on elements (#3985).
@@ -643,7 +644,9 @@ var DomUtils = {
       text = text.slice(11).trim();
       try {
         text = decodeURIComponent(text);
-      } catch (error) {}
+      } catch {
+        // Swallow
+      }
     }
     const script = document.createElement("script");
     script.textContent = text;

lib/find_mode_history.js

@@ -24,7 +24,7 @@ const FindModeHistory = {
       }
     }
 
-    chrome.storage.onChanged.addListener((changes, area) => {
+    chrome.storage.onChanged.addListener((changes, _area) => {
       if (changes[this.key]) {
         this.rawQueryList = changes[this.key].newValue;
       }

lib/handler_stack.js

@@ -51,7 +51,7 @@ class HandlerStack {
     const {
       eventNumber,
     } = this;
-    for (let handler of this.stack.slice().reverse()) {
+    for (const handler of this.stack.slice().reverse()) {
       // A handler might have been removed (handler.id == null), so check; or there might just be no
       // handler for this type of event.
       if (!(handler != null ? handler.id : undefined) || !handler[type]) {
@@ -159,7 +159,7 @@ class HandlerStack {
 
   show() {
     console.log(`${this.eventNumber}:`);
-    for (let handler of this.stack.slice().reverse()) {
+    for (const handler of this.stack.slice().reverse()) {
       console.log("  ", handler._name);
     }
   }

lib/rect.js

@@ -1,5 +1,5 @@
 // Commands for manipulating rects.
-var Rect = {
+const Rect = {
   // Create a rect given the top left and bottom right corners.
   create(x1, y1, x2, y2) {
     return {
@@ -94,7 +94,7 @@ var Rect = {
   },
 
   equals(rect1, rect2) {
-    for (let property of ["top", "bottom", "left", "right", "width", "height"]) {
+    for (const property of ["top", "bottom", "left", "right", "width", "height"]) {
       if (rect1[property] !== rect2[property]) return false;
     }
     return true;

lib/settings.js

@@ -86,7 +86,7 @@ const Settings = {
     }
   },
 
-  async chromeStorageOnChanged(changes, area) {
+  async chromeStorageOnChanged(_changes, area) {
     // We store data with keys [settings-v1, ...] into the local storage. Only broadcast an event if
     // the object stored with the settings key has changed.
     // We only store settings in the sync area, so storage.sync changes must be settings changes.

lib/utils.js

@@ -101,7 +101,7 @@ const Utils = {
     return uri.split(/(?=%)/).map(function (uriComponent) {
       try {
         return decodeURIComponent(uriComponent);
-      } catch (error) {
+      } catch {
         return uriComponent;
       }
     }).join("");
@@ -209,15 +209,15 @@ const Utils = {
       // We require the URL to start with the search URL.
       if (!url.startsWith(searchUrl)) return null;
       // We require any remaining terms in the search URL to also be present in the URL.
-      for (let suffix of suffixTerms) {
+      for (const suffix of suffixTerms) {
         if (!(0 <= url.indexOf(suffix))) return null;
       }
       // We use try/catch because decodeURIComponent can throw an exception.
       try {
         return url.slice(searchUrl.length).split(queryTerminator)[0].split("+").map(
           decodeURIComponent,
         ).join(" ");
-      } catch (error) {
+      } catch {
         return null;
       }
     };
@@ -280,7 +280,7 @@ const Utils = {
   pick(object, propertyList) {
     const result = {};
     for (const property of propertyList) {
-      if (object.hasOwnProperty(property)) {
+      if (Object.prototype.hasOwnProperty.call(object, property)) {
         result[property] = object[property];
       }
     }
@@ -294,7 +294,7 @@ const Utils = {
 
   // Does string match any of these regexps?
   matchesAnyRegexp(regexps, string) {
-    for (let re of regexps) {
+    for (const re of regexps) {
       if (re.test(string)) return true;
     }
     return false;
@@ -311,7 +311,7 @@ const Utils = {
   },
 
   promiseWithTimeout(promise, ms) {
-    const timeoutPromise = new Promise((resolve, reject) => {
+    const timeoutPromise = new Promise((_resolve, reject) => {
       setTimeout(() => reject(new Error(`Promise timed out after ${ms}ms.`)), ms);
     });
     return Promise.race([promise, timeoutPromise]);
@@ -320,8 +320,9 @@ const Utils = {
   // Make an idempotent function.
   makeIdempotent(func) {
     return function (...args) {
-      let previousFunc, ref;
-      const result = ([previousFunc, func] = Array.from(ref = [func, null]), ref)[0];
+      // TODO(philc): Clean up this transpiled code.
+      let _, ref;
+      const result = ([_, func] = Array.from(ref = [func, null]), ref)[0];
       if (result) {
         return result(...Array.from(args || []));
       }
@@ -331,7 +332,7 @@ const Utils = {
   monitorChromeSessionStorage(key, setter) {
     return chrome.storage.session.get(key, (obj) => {
       if (obj[key] != null) setter(obj[key]);
-      return chrome.storage.onChanged.addListener((changes, area) => {
+      return chrome.storage.onChanged.addListener((changes, _area) => {
         if (changes[key] && (changes[key].newValue !== undefined)) {
           return setter(changes[key].newValue);
         }
@@ -481,7 +482,7 @@ class AsyncDataFetcher {
     Utils.nextTick(() => {
       fetch((data) => {
         this.data = data;
-        for (let callback of this.queue) callback(this.data);
+        for (const callback of this.queue) callback(this.data);
         return this.queue = null;
       });
     });