Skip to content
This repository was archived by the owner on Nov 6, 2023. It is now read-only.

Commit 68425c9

Browse files
author
Chan Chak Shing
authored
Fix JS errors found by LGTM.com (#19254)
* Fix access to let-bound variable in temporal dead zone * Code style: add semicolons as appropriate * Add eslint rule: no-invalid-regexp * Add eslint rule: semi * Add semicolons as warned by eslint * More semicolons as per eslint warnings
1 parent 02c32d1 commit 68425c9

File tree

14 files changed

+48
-46
lines changed

14 files changed

+48
-46
lines changed

chromium/.eslintrc.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@
1313
"no-unused-vars": "error",
1414
"no-undef": "error",
1515
"strict": ["error", "global"],
16+
"semi": ["error", "always"],
1617
"space-before-blocks": ["error"],
1718
"brace-style": ["error"],
19+
"no-invalid-regexp": "error",
1820
"no-trailing-spaces": "error"
1921
},
2022
"globals": {

chromium/background-scripts/background.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ BrowserSession.prototype = {
313313
this.requests.delete(requestId);
314314
}
315315
}
316-
}
316+
};
317317

318318
let browserSession = new BrowserSession();
319319

@@ -647,7 +647,7 @@ function onHeadersReceived(details) {
647647
const upgradeInsecureRequests = {
648648
name: 'Content-Security-Policy',
649649
value: 'upgrade-insecure-requests'
650-
}
650+
};
651651
details.responseHeaders.push(upgradeInsecureRequests);
652652
responseHeadersChanged = true;
653653
}
@@ -670,7 +670,7 @@ chrome.webRequest.onBeforeRedirect.addListener(onBeforeRedirect, {urls: ["https:
670670
chrome.webRequest.onCompleted.addListener(onCompleted, {urls: ["*://*/*"]});
671671

672672
// Cleanup redirectCounter if necessary
673-
chrome.webRequest.onErrorOccurred.addListener(onErrorOccurred, {urls: ["*://*/*"]})
673+
chrome.webRequest.onErrorOccurred.addListener(onErrorOccurred, {urls: ["*://*/*"]});
674674

675675
// Insert upgrade-insecure-requests directive in httpNowhere mode
676676
chrome.webRequest.onHeadersReceived.addListener(onHeadersReceived, {urls: ["https://*/*"]}, ["blocking", "responseHeaders"]);
@@ -793,7 +793,7 @@ chrome.runtime.onMessage.addListener(function(message, sender, sendResponse) {
793793
if (sendResponse !== null) {
794794
sendResponse(true);
795795
}
796-
})
796+
});
797797
return true;
798798
},
799799
get_ruleset_timestamps: () => {

chromium/background-scripts/incognito.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Incognito.prototype = {
4343
}
4444
}
4545
},
46-
}
46+
};
4747

4848
/**
4949
* Check if any incognito window still exists

chromium/background-scripts/rules.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ RuleSets.prototype = {
266266

267267
// If a ruleset declares a platform, and we don't match it, treat it as
268268
// off-by-default. In practice, this excludes "mixedcontent" rules.
269-
var platform = ruletag["platform"]
269+
var platform = ruletag["platform"];
270270
if (platform) {
271271
default_state = false;
272272
if (platform == "mixedcontent" && settings.enableMixedRulesets) {
@@ -365,7 +365,7 @@ RuleSets.prototype = {
365365
if (this.wasm_rs) {
366366
this.wasm_rs.remove_ruleset(ruleset);
367367
} else {
368-
const tmp = this.targets.get(ruleset.name).filter(r => !r.isEquivalentTo(ruleset))
368+
const tmp = this.targets.get(ruleset.name).filter(r => !r.isEquivalentTo(ruleset));
369369
this.targets.set(ruleset.name, tmp);
370370

371371
if (this.targets.get(ruleset.name).length == 0) {
@@ -488,7 +488,7 @@ RuleSets.prototype = {
488488

489489
let default_off = ruletag.getAttribute("default_off");
490490
if (default_off) {
491-
ruleset["default_off"] = platform;
491+
ruleset["default_off"] = default_off;
492492
}
493493

494494
let platform = ruletag.getAttribute("platform");

chromium/background-scripts/store.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,13 @@ async function performMigrations() {
8686
target: [userRule.host],
8787
rule: [{ from: userRule.urlMatcher, to: userRule.redirectTo }],
8888
default_off: "user rule"
89-
}
90-
})
89+
};
90+
});
9191
return userRules;
9292
})
9393
.then(userRules => {
9494
return set_promise(rules.RuleSets().USER_RULE_KEY, userRules);
95-
})
95+
});
9696

9797
migration_version = 2;
9898
await set_promise('migration_version', migration_version);
@@ -103,12 +103,12 @@ async function performMigrations() {
103103
.then(disabledList => {
104104
disabledList = disabledList.map(item => {
105105
return util.getNormalisedHostname(item);
106-
})
106+
});
107107
return disabledList;
108108
})
109109
.then(disabledList => {
110110
return set_promise('disabledList', disabledList);
111-
})
111+
});
112112

113113
migration_version = 3;
114114
await set_promise('migration_version', migration_version);

chromium/pages/cancel/ux.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ let observer;
66
document.addEventListener("DOMContentLoaded", () => {
77
const explainer = document.querySelector("[data-i18n=cancel_he_blocking_explainer]");
88
observer = new MutationObserver(() => {
9-
replaceLink(explainer)
9+
replaceLink(explainer);
1010
});
1111
if (explainer.innerText.length > 0) {
1212
replaceLink(explainer);

chromium/pages/debugging-rulesets/ux.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ document.getElementById("save-button").addEventListener("click", e => {
3535
sendMessage("set_option", { debugging_rulesets: cm.getValue() }, () => {
3636
savedTextElement.style.display = "block";
3737
setTimeout(() => {
38-
savedTextElement.style.display = "none"
38+
savedTextElement.style.display = "none";
3939
}, 1000);
4040

4141
valueHasChanged = false;

chromium/pages/options/ux.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,28 @@ if (navigator.userAgent.includes("Android")) {
2020
}
2121

2222
document.addEventListener("DOMContentLoaded", () => {
23-
const secretArea = document.getElementById('secretArea')
23+
const secretArea = document.getElementById('secretArea');
2424

2525
const onKeyDownHandler = evt => {
2626
if (evt.ctrlKey && evt.key === 'z') {
27-
secretArea.classList.remove('hidden')
28-
secretArea.classList.add('flash')
27+
secretArea.classList.remove('hidden');
28+
secretArea.classList.add('flash');
2929

30-
sendMessage('set_option', { developerMode: true })
30+
sendMessage('set_option', { developerMode: true });
3131

32-
document.removeEventListener('keydown', onKeyDownHandler)
32+
document.removeEventListener('keydown', onKeyDownHandler);
3333

34-
evt.preventDefault()
34+
evt.preventDefault();
3535
}
36-
}
36+
};
3737

3838
sendMessage('get_option', { developerMode: false }, item => {
3939
if (item.developerMode) {
40-
secretArea.classList.remove('hidden')
40+
secretArea.classList.remove('hidden');
4141
} else {
42-
document.addEventListener('keydown', onKeyDownHandler)
42+
document.addEventListener('keydown', onKeyDownHandler);
4343
}
44-
})
44+
});
4545

4646
const autoUpdateRulesets = document.getElementById("autoUpdateRulesets");
4747
const enableMixedRulesets = document.getElementById("enableMixedRulesets");
@@ -295,7 +295,7 @@ document.addEventListener("DOMContentLoaded", () => {
295295
sendMessage("remove_rule", { ruleset: userRule, src: 'options' });
296296
});
297297
}
298-
})
298+
});
299299

300300
// HTTPS Everywhere Sites Disabled section in General Settings module
301301
getOption_("disabledList", [], function(item) {

chromium/pages/popup/ux.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ function updateEnabledDisabledUI() {
153153
e('disableButton').style.visibility = "visible";
154154
// Hide or show the rules sections
155155
if (item.globalEnabled) {
156-
document.body.className = ""
156+
document.body.className = "";
157157
e('onoffswitch_label').innerText = chrome.i18n.getMessage("menu_globalEnable");
158158
showHttpNowhereUI();
159159
} else {
@@ -172,7 +172,7 @@ function toggleEnabledDisabled() {
172172
chrome.tabs.reload();
173173
window.close();
174174
}, 1500);
175-
}
175+
};
176176

177177
getOption_('globalEnabled', true, function(item) {
178178
setOption_('globalEnabled', !item.globalEnabled, extension_toggle_effect);
@@ -253,7 +253,7 @@ document.addEventListener("DOMContentLoaded", function () {
253253
timestamp_span.className = "rulesets-version";
254254
timestamp_span.innerText = `${chrome.i18n.getMessage("about_rulesets_version")} ${update_channel_name}: ${ruleset_version_string}`;
255255
this.appendChild(timestamp_span);
256-
}
256+
};
257257

258258
sendMessage("get_ruleset_timestamps", null, timestamps => {
259259
let replaces = timestamps.some(([update_channel, timestamp]) =>
@@ -408,10 +408,10 @@ function getTab(callback) {
408408
// to open in regular tab even if the popup is opened in incognito mode.
409409

410410
document.addEventListener('click', e => {
411-
const { target } = e
411+
const { target } = e;
412412

413413
if (target.matches('a[target="_blank"]')) {
414-
chrome.tabs.create({ url: target.href })
415-
e.preventDefault()
414+
chrome.tabs.create({ url: target.href });
415+
e.preventDefault();
416416
}
417-
})
417+
});

chromium/test/incognito_test.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
'use strict'
1+
'use strict';
22

33
const expect = require('chai').expect,
44
tu = require('./testing_utils'),
@@ -19,11 +19,11 @@ describe('incognito.js', function() {
1919
this.callbackCalled = false;
2020
this.callback = () => this.callbackCalled = true;
2121
this.instance = incognito.onIncognitoDestruction(this.callback);
22-
})
22+
});
2323

2424
it('no incognito session by default', function() {
2525
expect(incognito.state.incognito_session_exists).to.be.false;
26-
})
26+
});
2727

2828
it('with no incognito, callback not called', async function() {
2929
incognito.state.incognito_session_exists = false;
@@ -54,6 +54,6 @@ describe('incognito.js', function() {
5454
it('detects when an incognito window is created', function() {
5555
this.instance.detect_incognito_creation({incognito: true});
5656
expect(incognito.state.incognito_session_exists, 'constant changed').to.be.true;
57-
})
57+
});
5858
});
5959
});

0 commit comments

Comments
 (0)