paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 22:43:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

eslint: Fix unicorn/catch-error-name.

Browse Source 
https://github.com/sindresorhus/eslint-plugin-unicorn/blob/master/docs/rules/catch-error-name.md

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2020-10-07 01:20:41 -07:00
committed by Tim Abbott
parent d654992164
commit f92224c744
11 changed files with 53 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
frontend_tests/node_tests/hotkey.js
View File

@@ -174,13 +174,13 @@ run_test("basic_chars", () => {
}; };
try { try {
return hotkey.process_keypress(e); return hotkey.process_keypress(e);
} catch (err) { } catch (error) {
// An exception will be thrown here if a different // An exception will be thrown here if a different
// function is called than the one declared. Try to // function is called than the one declared. Try to
// provide a useful error message. // provide a useful error message.
// add a newline to separate from other console output. // add a newline to separate from other console output.
console.log('\nERROR: Mapping for character "' + e.which + '" does not match tests.'); console.log('\nERROR: Mapping for character "' + e.which + '" does not match tests.');
throw err; throw error;
} }
} }
@@ -384,13 +384,13 @@ run_test("motion_keys", () => {
try { try {
return hotkey.process_keydown(e); return hotkey.process_keydown(e);
} catch (err) { } catch (error) {
// An exception will be thrown here if a different // An exception will be thrown here if a different
// function is called than the one declared. Try to // function is called than the one declared. Try to
// provide a useful error message. // provide a useful error message.
// add a newline to separate from other console output. // add a newline to separate from other console output.
console.log('\nERROR: Mapping for character "' + e.which + '" does not match tests.'); console.log('\nERROR: Mapping for character "' + e.which + '" does not match tests.');
throw err; throw error;
} }
} }

4
frontend_tests/node_tests/util.js
View File

@@ -111,8 +111,8 @@ run_test("robust_uri_decode", () => {
}); });
try { try {
util.robust_uri_decode("%E0%A4%A"); util.robust_uri_decode("%E0%A4%A");
} catch (e) { } catch (error) {
assert.equal(e, "foo"); assert.equal(error, "foo");
} }
}); });

4
frontend_tests/puppeteer_lib/common.js
View File

@@ -460,8 +460,8 @@ class CommonUtils {
const page = await this.get_page(); const page = await this.get_page();
try { try {
await test_function(page); await test_function(page);
} catch (e) { } catch (error) {
console.log(e); console.log(error);
// Take a screenshot, and increment the screenshot_id. // Take a screenshot, and increment the screenshot_id.
await this.screenshot(page, `failure-${this.screenshot_id}`); await this.screenshot(page, `failure-${this.screenshot_id}`);

8
frontend_tests/zjsunit/index.js
View File

@@ -143,11 +143,11 @@ try {
namespace.restore(); namespace.restore();
Handlebars.HandlebarsEnvironment(); Handlebars.HandlebarsEnvironment();
}); });
} catch (e) { } catch (error) {
if (e.stack) { if (error.stack) {
console.info(short_tb(e.stack)); console.info(short_tb(error.stack));
} else { } else {
console.info(e); console.info(error);
} }
process.exit(1); process.exit(1);
} }

4
static/js/channel.js
View File

@@ -55,11 +55,11 @@ function call(args, idempotent) {
save_compose: true, save_compose: true,
}); });
} }
} catch (ex) { } catch (error) {
blueslip.error( blueslip.error(
"Unexpected 403 response from server", "Unexpected 403 response from server",
{xhr: xhr.responseText, args}, {xhr: xhr.responseText, args},
ex.stack, error.stack,
); );
} }
} }

10
static/js/markdown.js
View File

@@ -401,12 +401,12 @@ function handleRealmFilter(pattern, matches) {
function handleTex(tex, fullmatch) { function handleTex(tex, fullmatch) {
try { try {
return katex.renderToString(tex); return katex.renderToString(tex);
} catch (ex) { } catch (error) {
if (ex.message.startsWith("KaTeX parse error")) { if (error.message.startsWith("KaTeX parse error")) {
// TeX syntax error // TeX syntax error
return '<span class="tex-error">' + _.escape(fullmatch) + "</span>"; return '<span class="tex-error">' + _.escape(fullmatch) + "</span>";
} }
blueslip.error(ex); blueslip.error(error);
return undefined; return undefined;
} }
} }
@@ -460,11 +460,11 @@ function python_to_js_filter(pattern, url) {
let final_regex = null; let final_regex = null;
try { try {
final_regex = new RegExp(pattern, js_flags); final_regex = new RegExp(pattern, js_flags);
} catch (ex) { } catch (error) {
// We have an error computing the generated regex syntax. // We have an error computing the generated regex syntax.
// We'll ignore this realm filter for now, but log this // We'll ignore this realm filter for now, but log this
// failure for debugging later. // failure for debugging later.
blueslip.error("python_to_js_filter: " + ex.message); blueslip.error("python_to_js_filter: " + error.message);
} }
return [final_regex, url]; return [final_regex, url];
} }

12
static/js/reload.js
View File

@@ -141,10 +141,10 @@ exports.initialize = function () {
if (send_now) { if (send_now) {
compose.finish(); compose.finish();
} }
} catch (err) { } catch (error) {
// We log an error if we can't open the compose box, but otherwise // We log an error if we can't open the compose box, but otherwise
// we continue, since this is not critical. // we continue, since this is not critical.
blueslip.warn(err.toString()); blueslip.warn(error.toString());
} }
} }
@@ -181,8 +181,8 @@ function do_reload_app(send_after_reload, save_pointer, save_narrow, save_compos
if (save_pointer || save_narrow || save_compose) { if (save_pointer || save_narrow || save_compose) {
try { try {
preserve_state(send_after_reload, save_pointer, save_narrow, save_compose); preserve_state(send_after_reload, save_pointer, save_narrow, save_compose);
} catch (ex) { } catch (error) {
blueslip.error("Failed to preserve state", undefined, ex.stack); blueslip.error("Failed to preserve state", undefined, error.stack);
} }
} }
@@ -212,8 +212,8 @@ function do_reload_app(send_after_reload, save_pointer, save_narrow, save_compos
try { try {
server_events.cleanup_event_queue(); server_events.cleanup_event_queue();
} catch (ex) { } catch (error) {
blueslip.error("Failed to cleanup before reloading", undefined, ex.stack); blueslip.error("Failed to cleanup before reloading", undefined, error.stack);
} }
window.location.reload(true); window.location.reload(true);

38
static/js/server_events.js
View File

@@ -31,8 +31,12 @@ function get_events_success(events) {
for (const event of events) { for (const event of events) {
try { try {
get_events_params.last_event_id = Math.max(get_events_params.last_event_id, event.id); get_events_params.last_event_id = Math.max(get_events_params.last_event_id, event.id);
} catch (ex) { } catch (error) {
blueslip.error("Failed to update last_event_id", {event: clean_event(event)}, ex.stack); blueslip.error(
"Failed to update last_event_id",
{event: clean_event(event)},
error.stack,
);
} }
} }
@@ -81,11 +85,11 @@ function get_events_success(events) {
for (const event of events) { for (const event of events) {
try { try {
dispatch_event(event); dispatch_event(event);
} catch (ex1) { } catch (error) {
blueslip.error( blueslip.error(
"Failed to process an event\n" + blueslip.exception_msg(ex1), "Failed to process an event\n" + blueslip.exception_msg(error),
{event: clean_event(event)}, {event: clean_event(event)},
ex1.stack, error.stack,
); );
} }
} }
@@ -113,11 +117,11 @@ function get_events_success(events) {
message_events.insert_new_messages(messages, sent_by_this_client); message_events.insert_new_messages(messages, sent_by_this_client);
} }
} catch (ex2) { } catch (error) {
blueslip.error( blueslip.error(
"Failed to insert new messages\n" + blueslip.exception_msg(ex2), "Failed to insert new messages\n" + blueslip.exception_msg(error),
undefined, undefined,
ex2.stack, error.stack,
); );
} }
} }
@@ -129,11 +133,11 @@ function get_events_success(events) {
if (update_message_events.length !== 0) { if (update_message_events.length !== 0) {
try { try {
message_events.update_messages(update_message_events); message_events.update_messages(update_message_events);
} catch (ex3) { } catch (error) {
blueslip.error( blueslip.error(
"Failed to update messages\n" + blueslip.exception_msg(ex3), "Failed to update messages\n" + blueslip.exception_msg(error),
undefined, undefined,
ex3.stack, error.stack,
); );
} }
} }
@@ -208,11 +212,11 @@ function get_events(options) {
hide_ui_connection_error(); hide_ui_connection_error();
get_events_success(data.events); get_events_success(data.events);
} catch (ex) { } catch (error) {
blueslip.error( blueslip.error(
"Failed to handle get_events success\n" + blueslip.exception_msg(ex), "Failed to handle get_events success\n" + blueslip.exception_msg(error),
undefined, undefined,
ex.stack, error.stack,
); );
} }
get_events_timeout = setTimeout(get_events, 0); get_events_timeout = setTimeout(get_events, 0);
@@ -251,11 +255,11 @@ function get_events(options) {
} else { } else {
hide_ui_connection_error(); hide_ui_connection_error();
} }
} catch (ex) { } catch (error) {
blueslip.error( blueslip.error(
"Failed to handle get_events error\n" + blueslip.exception_msg(ex), "Failed to handle get_events error\n" + blueslip.exception_msg(error),
undefined, undefined,
ex.stack, error.stack,
); );
} }
const retry_sec = Math.min(90, Math.exp(get_events_failures / 2)); const retry_sec = Math.min(90, Math.exp(get_events_failures / 2));

4
static/js/submessage.js
View File

@@ -28,8 +28,8 @@ exports.process_submessages = function (in_opts) {
// damage that may be triggered by one rogue message. // damage that may be triggered by one rogue message.
try { try {
return exports.do_process_submessages(in_opts); return exports.do_process_submessages(in_opts);
} catch (err) { } catch (error) {
blueslip.error("in process_submessages: " + err.message); blueslip.error("in process_submessages: " + error.message);
return undefined; return undefined;
} }
}; };

6
static/js/util.js
View File

@@ -125,9 +125,9 @@ exports.robust_uri_decode = function (str) {
while (end > 0) { while (end > 0) {
try { try {
return decodeURIComponent(str.slice(0, end)); return decodeURIComponent(str.slice(0, end));
} catch (e) { } catch (error) {
if (!(e instanceof URIError)) { if (!(error instanceof URIError)) {
throw e; throw error;
} }
end -= 1; end -= 1;
} }

4
tools/message-screenshot.js
View File

@@ -70,8 +70,8 @@ async function run() {
const imageDir = path.dirname(imagePath); const imageDir = path.dirname(imagePath);
mkdirp.sync(imageDir); mkdirp.sync(imageDir);
await page.screenshot({path: imagePath, clip}); await page.screenshot({path: imagePath, clip});
} catch (e) { } catch (error) {
console.log(e); console.log(error);
process.exit(1); process.exit(1);
} finally { } finally {
await browser.close(); await browser.close();