Fix JS errors found by LGTM.com

chromium/.eslintrc.json

@@ -13,8 +13,10 @@
     "no-unused-vars": "error",
     "no-undef": "error",
     "strict": ["error", "global"],
+    "semi": ["error", "always"],
     "space-before-blocks": ["error"],
     "brace-style": ["error"],
+    "no-invalid-regexp": "error",
     "no-trailing-spaces": "error"
   },
   "globals": {

chromium/background-scripts/background.js

@@ -313,7 +313,7 @@ BrowserSession.prototype = {
       this.requests.delete(requestId);
     }
   }
-}
+};
 
 let browserSession = new BrowserSession();
 
@@ -647,7 +647,7 @@ function onHeadersReceived(details) {
       const upgradeInsecureRequests = {
         name: 'Content-Security-Policy',
         value: 'upgrade-insecure-requests'
-      }
+      };
       details.responseHeaders.push(upgradeInsecureRequests);
       responseHeadersChanged = true;
     }
@@ -670,7 +670,7 @@ chrome.webRequest.onBeforeRedirect.addListener(onBeforeRedirect, {urls: ["https:
 chrome.webRequest.onCompleted.addListener(onCompleted, {urls: ["*://*/*"]});
 
 // Cleanup redirectCounter if necessary
-chrome.webRequest.onErrorOccurred.addListener(onErrorOccurred, {urls: ["*://*/*"]})
+chrome.webRequest.onErrorOccurred.addListener(onErrorOccurred, {urls: ["*://*/*"]});
 
 // Insert upgrade-insecure-requests directive in httpNowhere mode
 chrome.webRequest.onHeadersReceived.addListener(onHeadersReceived, {urls: ["https://*/*"]}, ["blocking", "responseHeaders"]);
@@ -793,7 +793,7 @@ chrome.runtime.onMessage.addListener(function(message, sender, sendResponse) {
           if (sendResponse !== null) {
             sendResponse(true);
           }
-        })
+        });
       return true;
     },
     get_ruleset_timestamps: () => {

chromium/background-scripts/incognito.js

@@ -43,7 +43,7 @@ Incognito.prototype = {
       }
     }
   },
-}
+};
 
 /**
  * Check if any incognito window still exists

chromium/background-scripts/rules.js

@@ -266,7 +266,7 @@ RuleSets.prototype = {
 
     // If a ruleset declares a platform, and we don't match it, treat it as
     // off-by-default. In practice, this excludes "mixedcontent" rules.
-    var platform = ruletag["platform"]
+    var platform = ruletag["platform"];
     if (platform) {
       default_state = false;
       if (platform == "mixedcontent" && settings.enableMixedRulesets) {
@@ -365,7 +365,7 @@ RuleSets.prototype = {
       if (this.wasm_rs) {
         this.wasm_rs.remove_ruleset(ruleset);
       } else {
-        const tmp = this.targets.get(ruleset.name).filter(r => !r.isEquivalentTo(ruleset))
+        const tmp = this.targets.get(ruleset.name).filter(r => !r.isEquivalentTo(ruleset));
         this.targets.set(ruleset.name, tmp);
 
         if (this.targets.get(ruleset.name).length == 0) {
@@ -488,7 +488,7 @@ RuleSets.prototype = {
 
       let default_off = ruletag.getAttribute("default_off");
       if (default_off) {
-        ruleset["default_off"] = platform;
+        ruleset["default_off"] = default_off;
       }
 
       let platform = ruletag.getAttribute("platform");

chromium/background-scripts/store.js

@@ -86,13 +86,13 @@ async function performMigrations() {
             target: [userRule.host],
             rule: [{ from: userRule.urlMatcher, to: userRule.redirectTo }],
             default_off: "user rule"
-          }
-        })
+          };
+        });
         return userRules;
       })
       .then(userRules => {
         return set_promise(rules.RuleSets().USER_RULE_KEY, userRules);
-      })
+      });
 
     migration_version = 2;
     await set_promise('migration_version', migration_version);
@@ -103,12 +103,12 @@ async function performMigrations() {
       .then(disabledList => {
         disabledList = disabledList.map(item => {
           return util.getNormalisedHostname(item);
-        })
+        });
         return disabledList;
       })
       .then(disabledList => {
         return set_promise('disabledList', disabledList);
-      })
+      });
 
     migration_version = 3;
     await set_promise('migration_version', migration_version);

chromium/pages/cancel/ux.js

@@ -6,7 +6,7 @@ let observer;
 document.addEventListener("DOMContentLoaded", () => {
   const explainer = document.querySelector("[data-i18n=cancel_he_blocking_explainer]");
   observer = new MutationObserver(() => {
-    replaceLink(explainer)
+    replaceLink(explainer);
   });
   if (explainer.innerText.length > 0) {
     replaceLink(explainer);

chromium/pages/debugging-rulesets/ux.js

@@ -35,7 +35,7 @@ document.getElementById("save-button").addEventListener("click", e => {
   sendMessage("set_option", { debugging_rulesets: cm.getValue() }, () => {
     savedTextElement.style.display = "block";
     setTimeout(() => {
-      savedTextElement.style.display = "none"
+      savedTextElement.style.display = "none";
     }, 1000);
 
     valueHasChanged = false;

chromium/pages/options/ux.js

@@ -20,28 +20,28 @@ if (navigator.userAgent.includes("Android")) {
 }
 
 document.addEventListener("DOMContentLoaded", () => {
-  const secretArea = document.getElementById('secretArea')
+  const secretArea = document.getElementById('secretArea');
 
   const onKeyDownHandler = evt => {
     if (evt.ctrlKey && evt.key === 'z') {
-      secretArea.classList.remove('hidden')
-      secretArea.classList.add('flash')
+      secretArea.classList.remove('hidden');
+      secretArea.classList.add('flash');
 
-      sendMessage('set_option', { developerMode: true })
+      sendMessage('set_option', { developerMode: true });
 
-      document.removeEventListener('keydown', onKeyDownHandler)
+      document.removeEventListener('keydown', onKeyDownHandler);
 
-      evt.preventDefault()
+      evt.preventDefault();
     }
-  }
+  };
 
   sendMessage('get_option', { developerMode: false }, item => {
     if (item.developerMode) {
-      secretArea.classList.remove('hidden')
+      secretArea.classList.remove('hidden');
     } else {
-      document.addEventListener('keydown', onKeyDownHandler)
+      document.addEventListener('keydown', onKeyDownHandler);
     }
-  })
+  });
 
   const autoUpdateRulesets = document.getElementById("autoUpdateRulesets");
   const enableMixedRulesets = document.getElementById("enableMixedRulesets");
@@ -295,7 +295,7 @@ document.addEventListener("DOMContentLoaded", () => {
         sendMessage("remove_rule", { ruleset: userRule, src: 'options' });
       });
     }
-  })
+  });
 
   // HTTPS Everywhere Sites Disabled section in General Settings module
   getOption_("disabledList", [], function(item) {

chromium/pages/popup/ux.js

@@ -153,7 +153,7 @@ function updateEnabledDisabledUI() {
     e('disableButton').style.visibility = "visible";
     // Hide or show the rules sections
     if (item.globalEnabled) {
-      document.body.className = ""
+      document.body.className = "";
       e('onoffswitch_label').innerText = chrome.i18n.getMessage("menu_globalEnable");
       showHttpNowhereUI();
     } else {
@@ -172,7 +172,7 @@ function toggleEnabledDisabled() {
       chrome.tabs.reload();
       window.close();
     }, 1500);
-  }
+  };
 
   getOption_('globalEnabled', true, function(item) {
     setOption_('globalEnabled', !item.globalEnabled, extension_toggle_effect);
@@ -253,7 +253,7 @@ document.addEventListener("DOMContentLoaded", function () {
     timestamp_span.className = "rulesets-version";
     timestamp_span.innerText = `${chrome.i18n.getMessage("about_rulesets_version")} ${update_channel_name}: ${ruleset_version_string}`;
     this.appendChild(timestamp_span);
-  }
+  };
 
   sendMessage("get_ruleset_timestamps", null, timestamps => {
     let replaces = timestamps.some(([update_channel, timestamp]) =>
@@ -408,10 +408,10 @@ function getTab(callback) {
 // to open in regular tab even if the popup is opened in incognito mode.
 
 document.addEventListener('click', e => {
-  const { target } = e
+  const { target } = e;
 
   if (target.matches('a[target="_blank"]')) {
-    chrome.tabs.create({ url: target.href })
-    e.preventDefault()
+    chrome.tabs.create({ url: target.href });
+    e.preventDefault();
   }
-})
+});

chromium/test/incognito_test.js

@@ -1,4 +1,4 @@
-'use strict'
+'use strict';
 
 const expect = require('chai').expect,
   tu = require('./testing_utils'),
@@ -19,11 +19,11 @@ describe('incognito.js', function() {
       this.callbackCalled = false;
       this.callback = () => this.callbackCalled = true;
       this.instance = incognito.onIncognitoDestruction(this.callback);
-    })
+    });
 
     it('no incognito session by default', function() {
       expect(incognito.state.incognito_session_exists).to.be.false;
-    })
+    });
 
     it('with no incognito, callback not called', async function() {
       incognito.state.incognito_session_exists = false;
@@ -54,6 +54,6 @@ describe('incognito.js', function() {
     it('detects when an incognito window is created', function() {
       this.instance.detect_incognito_creation({incognito: true});
       expect(incognito.state.incognito_session_exists, 'constant changed').to.be.true;
-    })
+    });
   });
 });

chromium/test/rules_test.js

@@ -1,4 +1,4 @@
-'use strict'
+'use strict';
 
 const text_encoding = require('text-encoding');
 global.TextDecoder = text_encoding.TextDecoder;
@@ -88,7 +88,7 @@ describe('rules.js', function() {
         assert.isTrue(rs.isEquivalentTo(rs));
       });
     });
-  })
+  });
 
   describe('RuleSets', function() {
     let rules_json = [{
@@ -125,7 +125,7 @@ describe('rules.js', function() {
 
         let newuri = this.rsets.rewriteURI('http://' + host + '/', host);
 
-        assert.strictEqual(newuri, 'https://' + host + '/', 'protocol changed to https')
+        assert.strictEqual(newuri, 'https://' + host + '/', 'protocol changed to https');
       });
 
       it('does not rewrite unknown hosts', function() {
@@ -218,4 +218,4 @@ describe('rules.js', function() {
       });
     });
   });
-})
+});

chromium/test/testing_utils.js

@@ -1,9 +1,9 @@
-'use strict'
+'use strict';
 
 function Mock() {
   let out = function() {
     out.calledWith = Array.from(arguments);
-  }
+  };
   return out;
 }
 

chromium/test/update_test.js

@@ -1,4 +1,4 @@
-'use strict'
+'use strict';
 
 const assert = require('chai').assert,
   update = require('../background-scripts/update'),
@@ -68,4 +68,4 @@ describe('update.js', function() {
 
   });
 
-})
+});

chromium/test/util_test.js

@@ -46,7 +46,7 @@ describe('util.js', function() {
       assert.strictEqual(util.isValidHostname('example..com'), false);
       assert.strictEqual(util.isValidHostname('www.example..com'), false);
     });
-  })
+  });
 
   describe('getNormalisedHostname', function() {
     it('removes tailing dots', function() {