From cfdc08a0388eed1753209db974457c4ed3d7ca75 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <anders@zulipchat.com>
Date: Sat, 25 Apr 2020 15:03:37 -0700
Subject: [PATCH] xo: Enable unicorn/catch-error-name.

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
---
 app/renderer/js/main.ts                       |  8 +++----
 .../js/pages/preference/new-server-form.ts    |  4 ++--
 app/renderer/js/spellchecker.ts               |  4 ++--
 app/renderer/js/utils/certificate-util.ts     |  8 +++----
 app/renderer/js/utils/config-util.ts          | 14 ++++++------
 app/renderer/js/utils/domain-util.ts          | 22 +++++++++----------
 app/renderer/js/utils/enterprise-util.ts      |  4 ++--
 app/renderer/js/utils/linux-update-util.ts    |  4 ++--
 app/renderer/js/utils/proxy-util.ts           |  2 +-
 app/renderer/js/utils/reconnect-util.ts       |  4 ++--
 app/renderer/js/utils/request-util.ts         |  4 ++--
 package.json                                  |  1 -
 12 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/app/renderer/js/main.ts b/app/renderer/js/main.ts
index b267ef81..68929915 100644
--- a/app/renderer/js/main.ts
+++ b/app/renderer/js/main.ts
@@ -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);
diff --git a/app/renderer/js/pages/preference/new-server-form.ts b/app/renderer/js/pages/preference/new-server-form.ts
index f752a26b..46cc4733 100644
--- a/app/renderer/js/pages/preference/new-server-form.ts
+++ b/app/renderer/js/pages/preference/new-server-form.ts
@@ -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);
diff --git a/app/renderer/js/spellchecker.ts b/app/renderer/js/spellchecker.ts
index 2c4e9224..934a8b5a 100644
--- a/app/renderer/js/spellchecker.ts
+++ b/app/renderer/js/spellchecker.ts
@@ -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);
 	}
 }
 
diff --git a/app/renderer/js/utils/certificate-util.ts b/app/renderer/js/utils/certificate-util.ts
index fabf35eb..776c3463 100644
--- a/app/renderer/js/utils/certificate-util.ts
+++ b/app/renderer/js/utils/certificate-util.ts
@@ -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);
diff --git a/app/renderer/js/utils/config-util.ts b/app/renderer/js/utils/config-util.ts
index 502f9fcc..d1a8f8fc 100644
--- a/app/renderer/js/utils/config-util.ts
+++ b/app/renderer/js/utils/config-util.ts
@@ -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);
diff --git a/app/renderer/js/utils/domain-util.ts b/app/renderer/js/utils/domain-util.ts
index c5c81efe..cdf1f918 100644
--- a/app/renderer/js/utils/domain-util.ts
+++ b/app/renderer/js/utils/domain-util.ts
@@ -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);
diff --git a/app/renderer/js/utils/enterprise-util.ts b/app/renderer/js/utils/enterprise-util.ts
index e33cb04b..e0e6fabd 100644
--- a/app/renderer/js/utils/enterprise-util.ts
+++ b/app/renderer/js/utils/enterprise-util.ts
@@ -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;
diff --git a/app/renderer/js/utils/linux-update-util.ts b/app/renderer/js/utils/linux-update-util.ts
index 71972b46..85d18c89 100644
--- a/app/renderer/js/utils/linux-update-util.ts
+++ b/app/renderer/js/utils/linux-update-util.ts
@@ -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);
diff --git a/app/renderer/js/utils/proxy-util.ts b/app/renderer/js/utils/proxy-util.ts
index 5beadff1..b92002e7 100644
--- a/app/renderer/js/utils/proxy-util.ts
+++ b/app/renderer/js/utils/proxy-util.ts
@@ -10,7 +10,7 @@ export function getProxy(_uri: string): ProxyRule | void {
 	let uri;
 	try {
 		uri = new URL(_uri);
-	} catch (err) {
+	} catch (error) {
 		return;
 	}
 
diff --git a/app/renderer/js/utils/reconnect-util.ts b/app/renderer/js/utils/reconnect-util.ts
index fe00f3f6..0483c269 100644
--- a/app/renderer/js/utils/reconnect-util.ts
+++ b/app/renderer/js/utils/reconnect-util.ts
@@ -50,8 +50,8 @@ export default class ReconnectUtil {
 						resolve(isValidResponse);
 					}
 				);
-			} catch (err) {
-				logger.log(err);
+			} catch (error) {
+				logger.log(error);
 			}
 		});
 	}
diff --git a/app/renderer/js/utils/request-util.ts b/app/renderer/js/utils/request-util.ts
index 80563f29..9a8f9a9c 100644
--- a/app/renderer/js/utils/request-util.ts
+++ b/app/renderer/js/utils/request-util.ts
@@ -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');
diff --git a/package.json b/package.json
index 0fdf7601..7e8b6d0a 100644
--- a/package.json
+++ b/package.json
@@ -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": [