language-servers/deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-10-01 22:51:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix(cli/console): always quote and escape inspected strings (#7546)

Browse source
This commit is contained in:
Casper Beyer 2020-09-18 21:28:30 +08:00 • committed by GitHub
parent 7845740637
commit 38196f7850
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 36 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

26
cli/rt/02_console.js
View file

@ -405,7 +405,7 @@
switch (typeof value) {
case "string":
return value;
return green(quoteString(value));
case "number": // Numbers are yellow
// Special handling of -0
return yellow(Object.is(value, -0) ? "-0" : `${value}`);
@ -1265,8 +1265,12 @@
if (a > 0) {
string += " ";
}
// Use default maximum depth for null or undefined arguments.
string += inspectValue(args[a], new Set(), 0, rInspectOptions);
if (typeof args[a] == "string") {
string += args[a];
} else {
// Use default maximum depth for null or undefined arguments.
string += inspectValue(args[a], new Set(), 0, rInspectOptions);
}
}
if (rInspectOptions.indentLevel > 0) {
@ -1543,16 +1547,12 @@
value,
inspectOptions = {},
) {
if (typeof value === "string") {
return value;
} else {
return inspectValue(value, new Set(), 0, {
...DEFAULT_INSPECT_OPTIONS,
...inspectOptions,
// TODO(nayeemrmn): Indent level is not supported.
indentLevel: 0,
});
}
return inspectValue(value, new Set(), 0, {
...DEFAULT_INSPECT_OPTIONS,
...inspectOptions,
// TODO(nayeemrmn): Indent level is not supported.
indentLevel: 0,
});
}
// Expose these fields to internalObject for tests.

13
cli/tests/unit/console_test.ts
View file

@ -831,7 +831,7 @@ unitTest(function consoleTestWithStringFormatSpecifier(): void {
unitTest(function consoleTestWithObjectFormatSpecifier(): void {
assertEquals(stringify("%o"), "%o");
assertEquals(stringify("%o", 42), "42");
assertEquals(stringify("%o", "foo"), "foo");
assertEquals(stringify("%o", "foo"), `"foo"`);
assertEquals(stringify("o: %o, a: %O", {}, []), "o: {}, a: []");
assertEquals(stringify("%o", { a: 42 }), "{ a: 42 }");
assertEquals(
@ -1424,6 +1424,17 @@ unitTest(function consoleTrace(): void {
});
});
unitTest(function inspectString(): void {
assertEquals(
stripColor(Deno.inspect("\0")),
`"\\x00"`,
);
assertEquals(
stripColor(Deno.inspect("\x1b[2J")),
`"\\x1b[2J"`,
);
});
unitTest(function inspectSorted(): void {
assertEquals(
stripColor(Deno.inspect({ b: 2, a: 1 }, { sorted: true })),