nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

bug 1540684: remote: fix stray colons in error formatting; r=ochameau

Browse source 
Error messages contained extraneous colons that were inconsistent
with how JavaScript errors are usually formatted.

Examples of ill-formed formatting:

	FooError:

	FooError: bar:

The trailing colons should not be present in either of these cases.
Colons should only be printed when something follows.  For example:

	FooError

	FooError: bar

	FooError: bar:
		test.js:42

Differential Revision: https://phabricator.services.mozilla.com/D25608

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Andreas Tolfsen 2019-04-04 09:55:14 +00:00
parent 924a19a629
commit 9936854ecf
3 changed files with 17 additions and 9 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

1
remote/.eslintrc.js
View file

@ -3,5 +3,6 @@
module.exports = { module.exports = {
"rules": { "rules": {
"max-len": "off", "max-len": "off",
"no-tabs": "off",
} }
}; };

17
remote/Error.jsm
View file

@ -71,18 +71,25 @@ class UnsupportedError extends RemoteAgentError {}
class UnknownMethodError extends RemoteAgentError {} class UnknownMethodError extends RemoteAgentError {}
function formatError(error, {stack = false} = {}) { function formatError(error, {stack = false} = {}) {
const ls = []; const els = [];
ls.push(`${error.name}: ${error.message ? `${error.message}:` : ""}`); els.push(error.name);
if (error.message) {
els.push(": ");
els.push(error.message);
}
if (stack && error.stack) { if (stack && error.stack) {
els.push(":\n");
const stack = error.stack.trim().split("\n"); const stack = error.stack.trim().split("\n");
ls.push(stack.map(line => `\t${line}`).join("\n")); els.push(stack.map(line => `\t${line}`).join("\n"));
if (error.cause) { if (error.cause) {
ls.push("caused by: " + formatError(error.cause, {stack})); els.push("\n");
els.push("caused by: " + formatError(error.cause, {stack}));
} }
} }
return ls.join("\n"); return els.join("");
} }

8
remote/test/unit/test_Error.js
View file

@ -46,15 +46,15 @@ add_test(function test_RemoteAgentError_toString() {
add_test(function test_RemoteAgentError_format() { add_test(function test_RemoteAgentError_format() {
const {format} = RemoteAgentError; const {format} = RemoteAgentError;
equal(format({name: "HippoError"}), "HippoError: "); equal(format({name: "HippoError"}), "HippoError");
equal(format({name: "HorseError", message: "neigh"}), "HorseError: neigh:"); equal(format({name: "HorseError", message: "neigh"}), "HorseError: neigh");
const dog = { const dog = {
name: "DogError", name: "DogError",
message: "woof", message: "woof",
stack: " one\ntwo\nthree ", stack: " one\ntwo\nthree ",
}; };
equal(format(dog), "DogError: woof:"); equal(format(dog), "DogError: woof");
equal(format(dog, {stack: true}), equal(format(dog, {stack: true}),
`DogError: woof: `DogError: woof:
one one
@ -67,7 +67,7 @@ add_test(function test_RemoteAgentError_format() {
stack: "four\nfive\nsix", stack: "four\nfive\nsix",
cause: dog, cause: dog,
}; };
equal(format(cat), "CatError: meow:"); equal(format(cat), "CatError: meow");
equal(format(cat, {stack: true}), equal(format(cat, {stack: true}),
`CatError: meow: `CatError: meow:
four four