xo: Enable unicorn/catch-error-name.

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
This commit is contained in:
Anders Kaseorg
2020-04-25 15:03:37 -07:00
committed by Anders Kaseorg
parent b76467529d
commit cfdc08a038
12 changed files with 39 additions and 40 deletions

View File

@@ -254,8 +254,8 @@ class ServerManagerView {
const serverConf = await DomainUtil.checkDomain(domain);
await DomainUtil.addDomain(serverConf);
return true;
} catch (err) {
logger.error(err);
} catch (error) {
logger.error(error);
logger.error('Could not add ' + domain + '. Please contact your system administrator.');
return false;
}
@@ -625,7 +625,7 @@ class ServerManagerView {
try {
this.tabs[index].webview.canGoBackButton();
} catch (err) {
} catch (error) {
}
this.activeTabIndex = index;
@@ -891,7 +891,7 @@ class ServerManagerView {
webviews.forEach(webview => {
try {
webview.setAudioMuted(state);
} catch (err) {
} catch (error) {
// webview is not ready yet
webview.addEventListener('dom-ready', () => {
webview.setAudioMuted(state);

View File

@@ -66,9 +66,9 @@ export default class NewServerForm extends BaseComponent {
let serverConf;
try {
serverConf = await DomainUtil.checkDomain(this.$newServerUrl.value);
} catch (errorMessage) {
} catch (error) {
this.$saveServerButton.innerHTML = 'Connect';
alert(errorMessage);
alert(error);
return;
}
await DomainUtil.addDomain(serverConf);

View File

@@ -29,8 +29,8 @@ export function init(serverLanguage: string): void {
function enableSpellChecker(): void {
try {
spellCheckHandler = new SpellCheckHandler();
} catch (err) {
logger.error(err);
} catch (error) {
logger.error(error);
}
}

View File

@@ -38,13 +38,13 @@ export function copyCertificate(_server: string, location: string, fileName: str
try {
fs.copyFileSync(location, filePath);
copied = true;
} catch (err) {
} catch (error) {
dialog.showErrorBox(
'Error saving certificate',
'We encountered error while saving the certificate.'
);
logger.error('Error while copying the certificate to certificates folder.');
logger.error(err);
logger.error(error);
}
return copied;
}
@@ -65,7 +65,7 @@ function reloadDB(): void {
try {
const file = fs.readFileSync(settingsJsonPath, 'utf8');
JSON.parse(file);
} catch (err) {
} catch (error) {
if (fs.existsSync(settingsJsonPath)) {
fs.unlinkSync(settingsJsonPath);
dialog.showErrorBox(
@@ -73,7 +73,7 @@ function reloadDB(): void {
'We encountered error while saving the certificate.'
);
logger.error('Error while JSON parsing certificates.json: ');
logger.error(err);
logger.error(error);
}
}
db = new JsonDB(settingsJsonPath, true, true);

View File

@@ -31,9 +31,9 @@ reloadDB();
export function getConfigItem(key: string, defaultValue: any = null): any {
try {
db.reload();
} catch (err) {
} catch (error) {
logger.error('Error while reloading settings.json: ');
logger.error(err);
logger.error(error);
}
const value = db.getData('/')[key];
if (value === undefined) {
@@ -48,9 +48,9 @@ export function getConfigItem(key: string, defaultValue: any = null): any {
export function isConfigItemExists(key: string): boolean {
try {
db.reload();
} catch (err) {
} catch (error) {
logger.error('Error while reloading settings.json: ');
logger.error(err);
logger.error(error);
}
const value = db.getData('/')[key];
return (value !== undefined);
@@ -75,7 +75,7 @@ function reloadDB(): void {
try {
const file = fs.readFileSync(settingsJsonPath, 'utf8');
JSON.parse(file);
} catch (err) {
} catch (error) {
if (fs.existsSync(settingsJsonPath)) {
fs.unlinkSync(settingsJsonPath);
dialog.showErrorBox(
@@ -83,8 +83,8 @@ function reloadDB(): void {
'We encountered an error while saving the settings.'
);
logger.error('Error while JSON parsing settings.json: ');
logger.error(err);
logger.reportSentry(err);
logger.error(error);
logger.reportSentry(error);
}
}
db = new JsonDB(settingsJsonPath, true, true);

View File

@@ -158,10 +158,10 @@ export async function checkDomain(domain: string, ignoreCerts = false, silent =
try {
return await getServerSettings(domain, serverConf.ignoreCerts);
} catch (err) {
} catch (error_) {
// Make sure that error is an error or string not undefined
// so validation does not throw error.
const error = err || '';
const error = error_ || '';
const certsError = error.toString().includes('certificate');
if (certsError) {
@@ -232,10 +232,10 @@ export async function saveServerIcon(server: ServerConf, ignoreCerts = false): P
logger.reportSentry(err);
resolve(defaultIconUrl);
});
} catch (err) {
} catch (error) {
logger.log('Could not get server icon.');
logger.log(err);
logger.reportSentry(err);
logger.log(error);
logger.reportSentry(error);
resolve(defaultIconUrl);
}
});
@@ -253,10 +253,10 @@ export async function updateSavedServer(url: string, index: number): Promise<voi
updateDomain(index, newServerConf);
reloadDB();
}
} catch (err) {
} catch (error) {
logger.log('Could not update server icon.');
logger.log(err);
logger.reportSentry(err);
logger.log(error);
logger.reportSentry(error);
}
}
@@ -265,7 +265,7 @@ export function reloadDB(): void {
try {
const file = fs.readFileSync(domainJsonPath, 'utf8');
JSON.parse(file);
} catch (err) {
} catch (error) {
if (fs.existsSync(domainJsonPath)) {
fs.unlinkSync(domainJsonPath);
dialog.showErrorBox(
@@ -274,8 +274,8 @@ export function reloadDB(): void {
'you may have to re-add your previous organizations back.'
);
logger.error('Error while JSON parsing domain.json: ');
logger.error(err);
logger.reportSentry(err);
logger.error(error);
logger.reportSentry(error);
}
}
db = new JsonDB(domainJsonPath, true, true);

View File

@@ -26,9 +26,9 @@ function reloadDB(): void {
try {
const file = fs.readFileSync(enterpriseFile, 'utf8');
enterpriseSettings = JSON.parse(file);
} catch (err) {
} catch (error) {
logger.log('Error while JSON parsing global_config.json: ');
logger.log(err);
logger.log(error);
}
} else {
configFile = false;

View File

@@ -46,7 +46,7 @@ function reloadDB(): void {
try {
const file = fs.readFileSync(linuxUpdateJsonPath, 'utf8');
JSON.parse(file);
} catch (err) {
} catch (error) {
if (fs.existsSync(linuxUpdateJsonPath)) {
fs.unlinkSync(linuxUpdateJsonPath);
dialog.showErrorBox(
@@ -54,7 +54,7 @@ function reloadDB(): void {
'We encountered an error while saving the update notifications.'
);
logger.error('Error while JSON parsing updates.json: ');
logger.error(err);
logger.error(error);
}
}
db = new JsonDB(linuxUpdateJsonPath, true, true);

View File

@@ -10,7 +10,7 @@ export function getProxy(_uri: string): ProxyRule | void {
let uri;
try {
uri = new URL(_uri);
} catch (err) {
} catch (error) {
return;
}

View File

@@ -50,8 +50,8 @@ export default class ReconnectUtil {
resolve(isValidResponse);
}
);
} catch (err) {
logger.log(err);
} catch (error) {
logger.log(error);
}
});
}

View File

@@ -44,8 +44,8 @@ export function requestOptions(domain: string, ignoreCerts: boolean): RequestUti
// To handle case where certificate has been moved from the location in certificates.json
try {
certificateLocation = fs.readFileSync(certificateFile, 'utf8');
} catch (err) {
logger.warn(`Error while trying to get certificate: ${err}`);
} catch (error) {
logger.warn(`Error while trying to get certificate: ${error}`);
}
}
const proxyEnabled = ConfigUtil.getConfigItem('useManualProxy') || ConfigUtil.getConfigItem('useSystemProxy');

View File

@@ -225,7 +225,6 @@
"object-curly-spacing": "off",
"padding-line-between-statements": "off",
"strict": "error",
"unicorn/catch-error-name": "off",
"unicorn/string-content": "off"
},
"envs": [