mirror of
https://github.com/denoland/deno.git
synced 2025-01-21 13:00:36 -05:00
This reverts commit f75bd89aff
.
This commit is contained in:
parent
5bed06fb94
commit
81635c59e6
3 changed files with 12 additions and 23 deletions
|
@ -10,7 +10,9 @@
|
|||
}
|
||||
|
||||
function run(str, code) {
|
||||
return `${code.open}${str.replace(code.regexp, code.open)}${code.close}`;
|
||||
return !globalThis || !globalThis.Deno || globalThis.Deno.noColor
|
||||
? str
|
||||
: `${code.open}${str.replace(code.regexp, code.open)}${code.close}`;
|
||||
}
|
||||
|
||||
function bold(str) {
|
||||
|
@ -70,10 +72,6 @@
|
|||
return string.replace(ANSI_PATTERN, "");
|
||||
}
|
||||
|
||||
function maybeColor(fn) {
|
||||
return !(globalThis.Deno?.noColor ?? false) ? fn : (s) => s;
|
||||
}
|
||||
|
||||
window.__bootstrap.colors = {
|
||||
bold,
|
||||
italic,
|
||||
|
@ -87,6 +85,5 @@
|
|||
magenta,
|
||||
dim,
|
||||
stripColor,
|
||||
maybeColor,
|
||||
};
|
||||
})(this);
|
||||
|
|
|
@ -1425,12 +1425,10 @@
|
|||
const timerMap = new Map();
|
||||
const isConsoleInstance = Symbol("isConsoleInstance");
|
||||
|
||||
function getConsoleInspectOptions() {
|
||||
return {
|
||||
...DEFAULT_INSPECT_OPTIONS,
|
||||
colors: !(globalThis.Deno?.noColor ?? false),
|
||||
};
|
||||
}
|
||||
const CONSOLE_INSPECT_OPTIONS = {
|
||||
...DEFAULT_INSPECT_OPTIONS,
|
||||
colors: true,
|
||||
};
|
||||
|
||||
class Console {
|
||||
#printFunc = null;
|
||||
|
@ -1453,7 +1451,7 @@
|
|||
log = (...args) => {
|
||||
this.#printFunc(
|
||||
inspectArgs(args, {
|
||||
...getConsoleInspectOptions(),
|
||||
...CONSOLE_INSPECT_OPTIONS,
|
||||
indentLevel: this.indentLevel,
|
||||
}) + "\n",
|
||||
false,
|
||||
|
@ -1465,8 +1463,7 @@
|
|||
|
||||
dir = (obj, options = {}) => {
|
||||
this.#printFunc(
|
||||
inspectArgs([obj], { ...getConsoleInspectOptions(), ...options }) +
|
||||
"\n",
|
||||
inspectArgs([obj], { ...CONSOLE_INSPECT_OPTIONS, ...options }) + "\n",
|
||||
false,
|
||||
);
|
||||
};
|
||||
|
@ -1476,7 +1473,7 @@
|
|||
warn = (...args) => {
|
||||
this.#printFunc(
|
||||
inspectArgs(args, {
|
||||
...getConsoleInspectOptions(),
|
||||
...CONSOLE_INSPECT_OPTIONS,
|
||||
indentLevel: this.indentLevel,
|
||||
}) + "\n",
|
||||
true,
|
||||
|
@ -1682,7 +1679,7 @@
|
|||
trace = (...args) => {
|
||||
const message = inspectArgs(
|
||||
args,
|
||||
{ ...getConsoleInspectOptions(), indentLevel: 0 },
|
||||
{ ...CONSOLE_INSPECT_OPTIONS, indentLevel: 0 },
|
||||
);
|
||||
const err = {
|
||||
name: "Trace",
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
((window) => {
|
||||
const core = window.Deno.core;
|
||||
const colors = window.__bootstrap.colors;
|
||||
const { gray, green, italic, red, yellow } = window.__bootstrap.colors;
|
||||
const { exit } = window.__bootstrap.os;
|
||||
const { Console, inspectArgs } = window.__bootstrap.console;
|
||||
const { stdout } = window.__bootstrap.files;
|
||||
|
@ -19,8 +19,6 @@
|
|||
}
|
||||
|
||||
function formatDuration(time = 0) {
|
||||
const gray = colors.maybeColor(colors.gray);
|
||||
const italic = colors.maybeColor(colors.italic);
|
||||
const timeStr = `(${time}ms)`;
|
||||
return gray(italic(timeStr));
|
||||
}
|
||||
|
@ -141,9 +139,6 @@ finishing test case.`;
|
|||
}
|
||||
|
||||
function reportToConsole(message) {
|
||||
const green = colors.maybeColor(colors.green);
|
||||
const red = colors.maybeColor(colors.red);
|
||||
const yellow = colors.maybeColor(colors.yellow);
|
||||
const redFailed = red("FAILED");
|
||||
const greenOk = green("ok");
|
||||
const yellowIgnored = yellow("ignored");
|
||||
|
|
Loading…
Add table
Reference in a new issue